diff --git a/.gitignore b/.gitignore
index c05e7776daf1f9aa60b4f0b9c25d16fb97a514e2..d4d8bdd8301723290434844923789c5ab67e81f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,22 @@
-repos
+client
+vas
+src/vitis/client/conf
+src/vitis/client/modules/vmap
+src/vitis/vas/rest/ws/vmap
+src/vitis/vas/rest/conf/vmap
+src/vitis/vas/sql/vmap
+src/vitis/client/modules/vm4ms
+src/vitis/vas/rest/ws/vm4ms
+src/vitis/vas/rest/conf/vm4ms
+src/vitis/vas/sql/vm4ms
+src/vitis/client/modules/anc
+src/vitis/vas/rest/ws/anc
+src/vitis/vas/rest/conf/anc
+src/vitis/vas/sql/anc
+src/vitis/vas/rest/ws/cadastre
+src/vitis/vas/rest/conf/cadastre
+src/vitis/vas/rest/class/majic_lib
+src/vitis/vas/rest/ws/cadastreV2
+src/vitis/vas/rest/conf/cadastreV2
+src/vitis/vas/sql/cadastreV2
+src/vitis/vas/rest/class/majic_libV2
diff --git a/README.md b/README.md
index 9390e09469212c79c88170c0a8bf2e83fbb1a1d8..fe506131913c61a1aa29d5e9bd528f42ed8c5b64 100644
--- a/README.md
+++ b/README.md
@@ -10,3 +10,13 @@ vMap is able to manage business objects while using WMS producing server softwar
 - Try the [demo](https://demo.veremes.net/vmap/)
 - Download the setup on [vStore](https://vstore.veremes.net/store/)
 - Follow the [install procedure](http://www.veremes.com/procedure-dinstallation-de-vmap)
+
+
+## Contribute
+
+To contribute to this project run the following steps
+
+- Clone the repo on your local storage
+- Run utils/init_symlinks.sh to build your tree structure with symlinks
+- Run utils/pull_symlinks.sh to pull your code
+- Run utils/push_symlinks.sh to push your code
diff --git a/vmap/client/conf/conf/Gruntfile.js b/conf/Gruntfile.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/Gruntfile.js
rename to conf/Gruntfile.js
diff --git a/vmap/client/conf/conf/_install/apache.conf b/conf/_install/apache.conf
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/_install/apache.conf
rename to conf/_install/apache.conf
diff --git a/vmap/client/conf/conf/_install/dependency.xml b/conf/_install/dependency.xml
similarity index 100%
rename from vmap/client/conf/conf/_install/dependency.xml
rename to conf/_install/dependency.xml
diff --git a/vmap/client/conf/conf/_install/fileToDelete.txt b/conf/_install/fileToDelete.txt
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/_install/fileToDelete.txt
rename to conf/_install/fileToDelete.txt
diff --git a/vmap/client/conf/conf/_install/folderToDelete.txt b/conf/_install/folderToDelete.txt
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/_install/folderToDelete.txt
rename to conf/_install/folderToDelete.txt
diff --git a/vmap/client/conf/conf/credits.json b/conf/credits.json
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/credits.json
rename to conf/credits.json
diff --git a/vmap/client/conf/conf/less/variables.less b/conf/less/variables.less
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/less/variables.less
rename to conf/less/variables.less
diff --git a/vmap/client/conf/conf/node_modules/angular-mocks/README.md b/conf/node_modules/angular-mocks/README.md
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/angular-mocks/README.md
rename to conf/node_modules/angular-mocks/README.md
diff --git a/vmap/client/conf/conf/node_modules/angular-mocks/angular-mocks.js b/conf/node_modules/angular-mocks/angular-mocks.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/angular-mocks/angular-mocks.js
rename to conf/node_modules/angular-mocks/angular-mocks.js
diff --git a/vmap/client/conf/conf/node_modules/angular-mocks/bower.json b/conf/node_modules/angular-mocks/bower.json
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/angular-mocks/bower.json
rename to conf/node_modules/angular-mocks/bower.json
diff --git a/vmap/client/conf/conf/node_modules/angular-mocks/ngAnimateMock.js b/conf/node_modules/angular-mocks/ngAnimateMock.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/angular-mocks/ngAnimateMock.js
rename to conf/node_modules/angular-mocks/ngAnimateMock.js
diff --git a/vmap/client/conf/conf/node_modules/angular-mocks/ngMock.js b/conf/node_modules/angular-mocks/ngMock.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/angular-mocks/ngMock.js
rename to conf/node_modules/angular-mocks/ngMock.js
diff --git a/vmap/client/conf/conf/node_modules/angular-mocks/ngMockE2E.js b/conf/node_modules/angular-mocks/ngMockE2E.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/angular-mocks/ngMockE2E.js
rename to conf/node_modules/angular-mocks/ngMockE2E.js
diff --git a/vmap/client/conf/conf/node_modules/angular-mocks/package.json b/conf/node_modules/angular-mocks/package.json
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/angular-mocks/package.json
rename to conf/node_modules/angular-mocks/package.json
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/.bin/jsdoc b/conf/node_modules/jsdoc/api/.bin/jsdoc
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/.bin/jsdoc
rename to conf/node_modules/jsdoc/api/.bin/jsdoc
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/.bin/jsdoc.cmd b/conf/node_modules/jsdoc/api/.bin/jsdoc.cmd
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/.bin/jsdoc.cmd
rename to conf/node_modules/jsdoc/api/.bin/jsdoc.cmd
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/conf.json b/conf/node_modules/jsdoc/api/conf.json
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/conf.json
rename to conf/node_modules/jsdoc/api/conf.json
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/MyNamespace.html b/conf/node_modules/jsdoc/api/docs/MyNamespace.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/MyNamespace.html
rename to conf/node_modules/jsdoc/api/docs/MyNamespace.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/fonts/glyphicons-halflings-regular.eot b/conf/node_modules/jsdoc/api/docs/fonts/glyphicons-halflings-regular.eot
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/fonts/glyphicons-halflings-regular.eot
rename to conf/node_modules/jsdoc/api/docs/fonts/glyphicons-halflings-regular.eot
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/fonts/glyphicons-halflings-regular.svg b/conf/node_modules/jsdoc/api/docs/fonts/glyphicons-halflings-regular.svg
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/fonts/glyphicons-halflings-regular.svg
rename to conf/node_modules/jsdoc/api/docs/fonts/glyphicons-halflings-regular.svg
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/fonts/glyphicons-halflings-regular.ttf b/conf/node_modules/jsdoc/api/docs/fonts/glyphicons-halflings-regular.ttf
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/fonts/glyphicons-halflings-regular.ttf
rename to conf/node_modules/jsdoc/api/docs/fonts/glyphicons-halflings-regular.ttf
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/fonts/glyphicons-halflings-regular.woff b/conf/node_modules/jsdoc/api/docs/fonts/glyphicons-halflings-regular.woff
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/fonts/glyphicons-halflings-regular.woff
rename to conf/node_modules/jsdoc/api/docs/fonts/glyphicons-halflings-regular.woff
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/global.html b/conf/node_modules/jsdoc/api/docs/global.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/global.html
rename to conf/node_modules/jsdoc/api/docs/global.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/index.html b/conf/node_modules/jsdoc/api/docs/index.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/index.html
rename to conf/node_modules/jsdoc/api/docs/index.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/logo-70x70.png b/conf/node_modules/jsdoc/api/docs/logo-70x70.png
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/logo-70x70.png
rename to conf/node_modules/jsdoc/api/docs/logo-70x70.png
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.Map.MapPopup.html b/conf/node_modules/jsdoc/api/docs/nsVmap.Map.MapPopup.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.Map.MapPopup.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.Map.MapPopup.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.Map.MapTooltip.html b/conf/node_modules/jsdoc/api/docs/nsVmap.Map.MapTooltip.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.Map.MapTooltip.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.Map.MapTooltip.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.Map.html b/conf/node_modules/jsdoc/api/docs/nsVmap.Map.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.Map.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.Map.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.Map_MainController.html b/conf/node_modules/jsdoc/api/docs/nsVmap.Map_MainController.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.Map_MainController.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.Map_MainController.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.Map_mapController.html b/conf/node_modules/jsdoc/api/docs/nsVmap.Map_mapController.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.Map_mapController.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.Map_mapController.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.Map_mapDirective.html b/conf/node_modules/jsdoc/api/docs/nsVmap.Map_mapDirective.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.Map_mapDirective.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.Map_mapDirective.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.html b/conf/node_modules/jsdoc/api/docs/nsVmap.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsLayersTools.LayerTree.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsLayersTools.LayerTree.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsLayersTools.LayerTree.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsLayersTools.LayerTree.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsLayersTools.LayersOrder.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsLayersTools.LayersOrder.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsLayersTools.LayersOrder.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsLayersTools.LayersOrder.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsLayersTools.LayersTools.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsLayersTools.LayersTools.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsLayersTools.LayersTools.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsLayersTools.LayersTools.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsLayersTools.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsLayersTools.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsLayersTools.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsLayersTools.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.LayerTree.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.LayerTree.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.LayerTree.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.LayerTree.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.LayersOrder.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.LayersOrder.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.LayersOrder.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.LayersOrder.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.LayersOrder_layersorderController.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.LayersOrder_layersorderController.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.LayersOrder_layersorderController.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.LayersOrder_layersorderController.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.LayersOrder_layersorderDirective.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.LayersOrder_layersorderDirective.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.LayersOrder_layersorderDirective.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.LayersOrder_layersorderDirective.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.LayersTree.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.LayersTree.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.LayersTree.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.LayersTree.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.LayersTree_LayertreeController.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.LayersTree_LayertreeController.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.LayersTree_LayertreeController.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.LayersTree_LayertreeController.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.LayersTree_layertreeDirective.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.LayersTree_layertreeDirective.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.LayersTree_layertreeDirective.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.LayersTree_layertreeDirective.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.MapLegend.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.MapLegend.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.MapLegend.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.MapLegend.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.MapLegend_maplegendController.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.MapLegend_maplegendController.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.MapLegend_maplegendController.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.MapLegend_maplegendController.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.MapLegend_maplegendDirective.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.MapLegend_maplegendDirective.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.MapLegend_maplegendDirective.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.MapLegend_maplegendDirective.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.MapManager.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.MapManager.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.MapManager.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.MapManager.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.BingSuggestions.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.BingSuggestions.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.BingSuggestions.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.BingSuggestions.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.BingSuggestions_bingsuggestionsController.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.BingSuggestions_bingsuggestionsController.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.BingSuggestions_bingsuggestionsController.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.BingSuggestions_bingsuggestionsController.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.BingSuggestions_bingsuggestionsDirective.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.BingSuggestions_bingsuggestionsDirective.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.BingSuggestions_bingsuggestionsDirective.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.BingSuggestions_bingsuggestionsDirective.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.IGNSuggestions.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.IGNSuggestions.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.IGNSuggestions.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.IGNSuggestions.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.IGNSuggestions_ignsuggestionsController.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.IGNSuggestions_ignsuggestionsController.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.IGNSuggestions_ignsuggestionsController.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.IGNSuggestions_ignsuggestionsController.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.IGNSuggestions_ignsuggestionsDirective.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.IGNSuggestions_ignsuggestionsDirective.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.IGNSuggestions_ignsuggestionsDirective.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.IGNSuggestions_ignsuggestionsDirective.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.LoadGeometry.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.LoadGeometry.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.LoadGeometry.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.LoadGeometry.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.LoadGeometry_loadgeometryController.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.LoadGeometry_loadgeometryController.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.LoadGeometry_loadgeometryController.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.LoadGeometry_loadgeometryController.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.LoadGeometry_loadgeometryDirective.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.LoadGeometry_loadgeometryDirective.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.LoadGeometry_loadgeometryDirective.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.LoadGeometry_loadgeometryDirective.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.MapList.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.MapList.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.MapList.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.MapList.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.MapListLitle.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.MapListLitle.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.MapListLitle.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.MapListLitle.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.MapListLitle_maplistlitleController.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.MapListLitle_maplistlitleController.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.MapListLitle_maplistlitleController.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.MapListLitle_maplistlitleController.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.MapListLitle_maplistlitleDirective.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.MapListLitle_maplistlitleDirective.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.MapListLitle_maplistlitleDirective.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.MapListLitle_maplistlitleDirective.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.MapList_maplistController.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.MapList_maplistController.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.MapList_maplistController.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.MapList_maplistController.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.MapList_maplistDirective.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.MapList_maplistDirective.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.MapList_maplistDirective.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.MapList_maplistDirective.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.MapModalManager.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.MapModalManager.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.MapModalManager.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.MapModalManager.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.MapModalManager_mapmodalController.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.MapModalManager_mapmodalController.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.MapModalManager_mapmodalController.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.MapModalManager_mapmodalController.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.MapModalManager_mapmodalDirective.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.MapModalManager_mapmodalDirective.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.MapModalManager_mapmodalDirective.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.MapModalManager_mapmodalDirective.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.MyMap.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.MyMap.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.MyMap.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.MyMap.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.MyMap_mymapController.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.MyMap_mymapController.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.MyMap_mymapController.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.MyMap_mymapController.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.MyMap_mymapDirective.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.MyMap_mymapDirective.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.MyMap_mymapDirective.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.MyMap_mymapDirective.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.OSMSuggestions.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.OSMSuggestions.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.OSMSuggestions.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.OSMSuggestions.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.OSMSuggestions_osmsuggestionsController.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.OSMSuggestions_osmsuggestionsController.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.OSMSuggestions_osmsuggestionsController.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.OSMSuggestions_osmsuggestionsController.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.OSMSuggestions_osmsuggestionsDirective.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.OSMSuggestions_osmsuggestionsDirective.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.OSMSuggestions_osmsuggestionsDirective.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.OSMSuggestions_osmsuggestionsDirective.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.WFSSuggestions.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.WFSSuggestions.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.WFSSuggestions.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.WFSSuggestions.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.WFSSuggestions_wfssuggestionsController.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.WFSSuggestions_wfssuggestionsController.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.WFSSuggestions_wfssuggestionsController.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.WFSSuggestions_wfssuggestionsController.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.WFSSuggestions_wfssuggestionsDirective.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.WFSSuggestions_wfssuggestionsDirective.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.WFSSuggestions_wfssuggestionsDirective.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.WFSSuggestions_wfssuggestionsDirective.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.WMSSuggestions.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.WMSSuggestions.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.WMSSuggestions.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.WMSSuggestions.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.WMSSuggestions_wmssuggestionsController.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.WMSSuggestions_wmssuggestionsController.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.WMSSuggestions_wmssuggestionsController.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.WMSSuggestions_wmssuggestionsController.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.WMSSuggestions_wmssuggestionsDirective.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.WMSSuggestions_wmssuggestionsDirective.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.WMSSuggestions_wmssuggestionsDirective.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.WMSSuggestions_wmssuggestionsDirective.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsMapManager.nsMapModal.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsTools.Controls.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsTools.Controls.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsTools.Controls.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsTools.Controls.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsTools.Interactions.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsTools.Interactions.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsTools.Interactions.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsTools.Interactions.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsTools.MeasureTools.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsTools.MeasureTools.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsTools.MeasureTools.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsTools.MeasureTools.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsTools.Tools.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsTools.Tools.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsTools.Tools.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsTools.Tools.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsTools.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsTools.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsTools.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsTools.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.BasicTools.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.BasicTools.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.BasicTools.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.BasicTools.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.BasicTools_basictoolsController.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.BasicTools_basictoolsController.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.BasicTools_basictoolsController.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.BasicTools_basictoolsController.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.BasicTools_basictoolsDirective.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.BasicTools_basictoolsDirective.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.BasicTools_basictoolsDirective.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.BasicTools_basictoolsDirective.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Cadastre.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Cadastre.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Cadastre.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Cadastre.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Cadastre_cadastreController.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Cadastre_cadastreController.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Cadastre_cadastreController.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Cadastre_cadastreController.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Cadastre_cadastreDirective.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Cadastre_cadastreDirective.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Cadastre_cadastreDirective.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Cadastre_cadastreDirective.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Controls.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Controls.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Controls.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Controls.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Controls_controlsController.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Controls_controlsController.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Controls_controlsController.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Controls_controlsController.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Controls_controlsDirective.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Controls_controlsDirective.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Controls_controlsDirective.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Controls_controlsDirective.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Draw.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Draw.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Draw.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Draw.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Draw_drawController.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Draw_drawController.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Draw_drawController.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Draw_drawController.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Draw_drawDirective.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Draw_drawDirective.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Draw_drawDirective.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Draw_drawDirective.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.InfoContainer.Tab.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.InfoContainer.Tab.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.InfoContainer.Tab.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.InfoContainer.Tab.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.InfoContainer.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.InfoContainer.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.InfoContainer.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.InfoContainer.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.InfoContainer_infocontainerController.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.InfoContainer_infocontainerController.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.InfoContainer_infocontainerController.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.InfoContainer_infocontainerController.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.InfoContainer_infocontainerDirective.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.InfoContainer_infocontainerDirective.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.InfoContainer_infocontainerDirective.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.InfoContainer_infocontainerDirective.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Interactions.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Interactions.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Interactions.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Interactions.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Location.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Location.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Location.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Location.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Location_locationController.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Location_locationController.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Location_locationController.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Location_locationController.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Location_locationDirective.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Location_locationDirective.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Location_locationDirective.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Location_locationDirective.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Measure.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Measure.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Measure.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Measure.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.MeasureTools.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.MeasureTools.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.MeasureTools.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.MeasureTools.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Measure_measureController.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Measure_measureController.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Measure_measureController.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Measure_measureController.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Measure_measureDirective.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Measure_measureDirective.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Measure_measureDirective.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Measure_measureDirective.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Print.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Print.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Print.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Print.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Print_printController.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Print_printController.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Print_printController.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Print_printController.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Print_printDirective.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Print_printDirective.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Print_printDirective.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Print_printDirective.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Select.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Select.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Select.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Select.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Select_selectioninfoDirective.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Select_selectioninfoDirective.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Select_selectioninfoDirective.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Select_selectioninfoDirective.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Select_selecttoolController.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Select_selecttoolController.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Select_selecttoolController.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Select_selecttoolController.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Select_selecttoolDirective.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Select_selecttoolDirective.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Select_selecttoolDirective.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.Select_selecttoolDirective.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.ToolsManager.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.ToolsManager.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.ToolsManager.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.ToolsManager.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.ToolsManager_vmapToolsController.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.ToolsManager_vmapToolsController.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.ToolsManager_vmapToolsController.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.ToolsManager_vmapToolsController.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.ToolsManager_vmapToolsDirective.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.ToolsManager_vmapToolsDirective.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.ToolsManager_vmapToolsDirective.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.ToolsManager_vmapToolsDirective.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.html b/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.html
rename to conf/node_modules/jsdoc/api/docs/nsVmap.nsToolsManager.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/oVmap.vmapController.html b/conf/node_modules/jsdoc/api/docs/oVmap.vmapController.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/oVmap.vmapController.html
rename to conf/node_modules/jsdoc/api/docs/oVmap.vmapController.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/oVmap.vmapDirective.html b/conf/node_modules/jsdoc/api/docs/oVmap.vmapDirective.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/oVmap.vmapDirective.html
rename to conf/node_modules/jsdoc/api/docs/oVmap.vmapDirective.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/ol.html b/conf/node_modules/jsdoc/api/docs/ol.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/ol.html
rename to conf/node_modules/jsdoc/api/docs/ol.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/olx.animation.html b/conf/node_modules/jsdoc/api/docs/olx.animation.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/olx.animation.html
rename to conf/node_modules/jsdoc/api/docs/olx.animation.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/olx.control.html b/conf/node_modules/jsdoc/api/docs/olx.control.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/olx.control.html
rename to conf/node_modules/jsdoc/api/docs/olx.control.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/olx.format.html b/conf/node_modules/jsdoc/api/docs/olx.format.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/olx.format.html
rename to conf/node_modules/jsdoc/api/docs/olx.format.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/olx.html b/conf/node_modules/jsdoc/api/docs/olx.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/olx.html
rename to conf/node_modules/jsdoc/api/docs/olx.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/olx.interaction.html b/conf/node_modules/jsdoc/api/docs/olx.interaction.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/olx.interaction.html
rename to conf/node_modules/jsdoc/api/docs/olx.interaction.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/olx.layer.html b/conf/node_modules/jsdoc/api/docs/olx.layer.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/olx.layer.html
rename to conf/node_modules/jsdoc/api/docs/olx.layer.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/olx.parser.html b/conf/node_modules/jsdoc/api/docs/olx.parser.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/olx.parser.html
rename to conf/node_modules/jsdoc/api/docs/olx.parser.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/olx.render.html b/conf/node_modules/jsdoc/api/docs/olx.render.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/olx.render.html
rename to conf/node_modules/jsdoc/api/docs/olx.render.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/olx.source.html b/conf/node_modules/jsdoc/api/docs/olx.source.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/olx.source.html
rename to conf/node_modules/jsdoc/api/docs/olx.source.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/olx.style.html b/conf/node_modules/jsdoc/api/docs/olx.style.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/olx.style.html
rename to conf/node_modules/jsdoc/api/docs/olx.style.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/olx.tilegrid.html b/conf/node_modules/jsdoc/api/docs/olx.tilegrid.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/olx.tilegrid.html
rename to conf/node_modules/jsdoc/api/docs/olx.tilegrid.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/scripts/bootstrap.min.js b/conf/node_modules/jsdoc/api/docs/scripts/bootstrap.min.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/scripts/bootstrap.min.js
rename to conf/node_modules/jsdoc/api/docs/scripts/bootstrap.min.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/scripts/jquery.min.js b/conf/node_modules/jsdoc/api/docs/scripts/jquery.min.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/scripts/jquery.min.js
rename to conf/node_modules/jsdoc/api/docs/scripts/jquery.min.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/scripts/jquery.min.map b/conf/node_modules/jsdoc/api/docs/scripts/jquery.min.map
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/scripts/jquery.min.map
rename to conf/node_modules/jsdoc/api/docs/scripts/jquery.min.map
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/scripts/linenumber.js b/conf/node_modules/jsdoc/api/docs/scripts/linenumber.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/scripts/linenumber.js
rename to conf/node_modules/jsdoc/api/docs/scripts/linenumber.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/scripts/main.js b/conf/node_modules/jsdoc/api/docs/scripts/main.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/scripts/main.js
rename to conf/node_modules/jsdoc/api/docs/scripts/main.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/scripts/prettify/Apache-License-2.0.txt b/conf/node_modules/jsdoc/api/docs/scripts/prettify/Apache-License-2.0.txt
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/scripts/prettify/Apache-License-2.0.txt
rename to conf/node_modules/jsdoc/api/docs/scripts/prettify/Apache-License-2.0.txt
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/scripts/prettify/lang-css.js b/conf/node_modules/jsdoc/api/docs/scripts/prettify/lang-css.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/scripts/prettify/lang-css.js
rename to conf/node_modules/jsdoc/api/docs/scripts/prettify/lang-css.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/scripts/prettify/prettify.js b/conf/node_modules/jsdoc/api/docs/scripts/prettify/prettify.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/scripts/prettify/prettify.js
rename to conf/node_modules/jsdoc/api/docs/scripts/prettify/prettify.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/scripts/underscore-min.js b/conf/node_modules/jsdoc/api/docs/scripts/underscore-min.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/scripts/underscore-min.js
rename to conf/node_modules/jsdoc/api/docs/scripts/underscore-min.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/scripts/underscore-min.map b/conf/node_modules/jsdoc/api/docs/scripts/underscore-min.map
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/scripts/underscore-min.map
rename to conf/node_modules/jsdoc/api/docs/scripts/underscore-min.map
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/styles/bootstrap.min.css b/conf/node_modules/jsdoc/api/docs/styles/bootstrap.min.css
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/styles/bootstrap.min.css
rename to conf/node_modules/jsdoc/api/docs/styles/bootstrap.min.css
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/styles/jaguar.css b/conf/node_modules/jsdoc/api/docs/styles/jaguar.css
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/styles/jaguar.css
rename to conf/node_modules/jsdoc/api/docs/styles/jaguar.css
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/styles/prettify-jsdoc.css b/conf/node_modules/jsdoc/api/docs/styles/prettify-jsdoc.css
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/styles/prettify-jsdoc.css
rename to conf/node_modules/jsdoc/api/docs/styles/prettify-jsdoc.css
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/styles/prettify-tomorrow.css b/conf/node_modules/jsdoc/api/docs/styles/prettify-tomorrow.css
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/styles/prettify-tomorrow.css
rename to conf/node_modules/jsdoc/api/docs/styles/prettify-tomorrow.css
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/vmap.Interaction.html b/conf/node_modules/jsdoc/api/docs/vmap.Interaction.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/vmap.Interaction.html
rename to conf/node_modules/jsdoc/api/docs/vmap.Interaction.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/vmap.LayerTools.LayerTools.html b/conf/node_modules/jsdoc/api/docs/vmap.LayerTools.LayerTools.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/vmap.LayerTools.LayerTools.html
rename to conf/node_modules/jsdoc/api/docs/vmap.LayerTools.LayerTools.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/vmap.LayerTools.LayerTree.html b/conf/node_modules/jsdoc/api/docs/vmap.LayerTools.LayerTree.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/vmap.LayerTools.LayerTree.html
rename to conf/node_modules/jsdoc/api/docs/vmap.LayerTools.LayerTree.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/vmap.LayerTools.html b/conf/node_modules/jsdoc/api/docs/vmap.LayerTools.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/vmap.LayerTools.html
rename to conf/node_modules/jsdoc/api/docs/vmap.LayerTools.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/vmap.LayerTree.html b/conf/node_modules/jsdoc/api/docs/vmap.LayerTree.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/vmap.LayerTree.html
rename to conf/node_modules/jsdoc/api/docs/vmap.LayerTree.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/vmap.Layers.LayerTree.html b/conf/node_modules/jsdoc/api/docs/vmap.Layers.LayerTree.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/vmap.Layers.LayerTree.html
rename to conf/node_modules/jsdoc/api/docs/vmap.Layers.LayerTree.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/vmap.Layers.Layers.html b/conf/node_modules/jsdoc/api/docs/vmap.Layers.Layers.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/vmap.Layers.Layers.html
rename to conf/node_modules/jsdoc/api/docs/vmap.Layers.Layers.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/vmap.LayersTools.LayerTree.html b/conf/node_modules/jsdoc/api/docs/vmap.LayersTools.LayerTree.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/vmap.LayersTools.LayerTree.html
rename to conf/node_modules/jsdoc/api/docs/vmap.LayersTools.LayerTree.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/vmap.LayersTools.LayersTools.html b/conf/node_modules/jsdoc/api/docs/vmap.LayersTools.LayersTools.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/vmap.LayersTools.LayersTools.html
rename to conf/node_modules/jsdoc/api/docs/vmap.LayersTools.LayersTools.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/vmap.LayersTools.html b/conf/node_modules/jsdoc/api/docs/vmap.LayersTools.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/vmap.LayersTools.html
rename to conf/node_modules/jsdoc/api/docs/vmap.LayersTools.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/vmap.LayertreeController.html b/conf/node_modules/jsdoc/api/docs/vmap.LayertreeController.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/vmap.LayertreeController.html
rename to conf/node_modules/jsdoc/api/docs/vmap.LayertreeController.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/vmap.Map.html b/conf/node_modules/jsdoc/api/docs/vmap.Map.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/vmap.Map.html
rename to conf/node_modules/jsdoc/api/docs/vmap.Map.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/vmap.MeasuretoolsController.html b/conf/node_modules/jsdoc/api/docs/vmap.MeasuretoolsController.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/vmap.MeasuretoolsController.html
rename to conf/node_modules/jsdoc/api/docs/vmap.MeasuretoolsController.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/vmap.MesureTools.html b/conf/node_modules/jsdoc/api/docs/vmap.MesureTools.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/vmap.MesureTools.html
rename to conf/node_modules/jsdoc/api/docs/vmap.MesureTools.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/vmap.Tools.Controls.html b/conf/node_modules/jsdoc/api/docs/vmap.Tools.Controls.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/vmap.Tools.Controls.html
rename to conf/node_modules/jsdoc/api/docs/vmap.Tools.Controls.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/vmap.Tools.Interactions.html b/conf/node_modules/jsdoc/api/docs/vmap.Tools.Interactions.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/vmap.Tools.Interactions.html
rename to conf/node_modules/jsdoc/api/docs/vmap.Tools.Interactions.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/vmap.Tools.MeasureTools.html b/conf/node_modules/jsdoc/api/docs/vmap.Tools.MeasureTools.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/vmap.Tools.MeasureTools.html
rename to conf/node_modules/jsdoc/api/docs/vmap.Tools.MeasureTools.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/vmap.Tools.MesureTools.html b/conf/node_modules/jsdoc/api/docs/vmap.Tools.MesureTools.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/vmap.Tools.MesureTools.html
rename to conf/node_modules/jsdoc/api/docs/vmap.Tools.MesureTools.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/vmap.Tools.Tools.html b/conf/node_modules/jsdoc/api/docs/vmap.Tools.Tools.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/vmap.Tools.Tools.html
rename to conf/node_modules/jsdoc/api/docs/vmap.Tools.Tools.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/vmap.Tools.html b/conf/node_modules/jsdoc/api/docs/vmap.Tools.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/vmap.Tools.html
rename to conf/node_modules/jsdoc/api/docs/vmap.Tools.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/vmap.html b/conf/node_modules/jsdoc/api/docs/vmap.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/vmap.html
rename to conf/node_modules/jsdoc/api/docs/vmap.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/vmapx.LayerTools.html b/conf/node_modules/jsdoc/api/docs/vmapx.LayerTools.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/vmapx.LayerTools.html
rename to conf/node_modules/jsdoc/api/docs/vmapx.LayerTools.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/vmapx.Tools.html b/conf/node_modules/jsdoc/api/docs/vmapx.Tools.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/vmapx.Tools.html
rename to conf/node_modules/jsdoc/api/docs/vmapx.Tools.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/docs/vmapx.html b/conf/node_modules/jsdoc/api/docs/vmapx.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/docs/vmapx.html
rename to conf/node_modules/jsdoc/api/docs/vmapx.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/.jshintrc b/conf/node_modules/jsdoc/api/jsdoc/.jshintrc
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/.jshintrc
rename to conf/node_modules/jsdoc/api/jsdoc/.jshintrc
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/.npmignore b/conf/node_modules/jsdoc/api/jsdoc/.npmignore
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/.npmignore
rename to conf/node_modules/jsdoc/api/jsdoc/.npmignore
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/.travis.yml b/conf/node_modules/jsdoc/api/jsdoc/.travis.yml
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/.travis.yml
rename to conf/node_modules/jsdoc/api/jsdoc/.travis.yml
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/Apache_License_2.0.txt b/conf/node_modules/jsdoc/api/jsdoc/Apache_License_2.0.txt
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/Apache_License_2.0.txt
rename to conf/node_modules/jsdoc/api/jsdoc/Apache_License_2.0.txt
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/CONTRIBUTING.md b/conf/node_modules/jsdoc/api/jsdoc/CONTRIBUTING.md
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/CONTRIBUTING.md
rename to conf/node_modules/jsdoc/api/jsdoc/CONTRIBUTING.md
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/Jake/lib/mustache.js b/conf/node_modules/jsdoc/api/jsdoc/Jake/lib/mustache.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/Jake/lib/mustache.js
rename to conf/node_modules/jsdoc/api/jsdoc/Jake/lib/mustache.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/Jake/templates/package.json.tmpl b/conf/node_modules/jsdoc/api/jsdoc/Jake/templates/package.json.tmpl
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/Jake/templates/package.json.tmpl
rename to conf/node_modules/jsdoc/api/jsdoc/Jake/templates/package.json.tmpl
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/Jakefile.js b/conf/node_modules/jsdoc/api/jsdoc/Jakefile.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/Jakefile.js
rename to conf/node_modules/jsdoc/api/jsdoc/Jakefile.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/LICENSE.md b/conf/node_modules/jsdoc/api/jsdoc/LICENSE.md
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/LICENSE.md
rename to conf/node_modules/jsdoc/api/jsdoc/LICENSE.md
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/README.md b/conf/node_modules/jsdoc/api/jsdoc/README.md
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/README.md
rename to conf/node_modules/jsdoc/api/jsdoc/README.md
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/changes.md b/conf/node_modules/jsdoc/api/jsdoc/changes.md
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/changes.md
rename to conf/node_modules/jsdoc/api/jsdoc/changes.md
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/conf.json.EXAMPLE b/conf/node_modules/jsdoc/api/jsdoc/conf.json.EXAMPLE
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/conf.json.EXAMPLE
rename to conf/node_modules/jsdoc/api/jsdoc/conf.json.EXAMPLE
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/jsdoc b/conf/node_modules/jsdoc/api/jsdoc/jsdoc
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/jsdoc
rename to conf/node_modules/jsdoc/api/jsdoc/jsdoc
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/jsdoc.cmd b/conf/node_modules/jsdoc/api/jsdoc/jsdoc.cmd
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/jsdoc.cmd
rename to conf/node_modules/jsdoc/api/jsdoc/jsdoc.cmd
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/jsdoc.js b/conf/node_modules/jsdoc/api/jsdoc/jsdoc.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/jsdoc.js
rename to conf/node_modules/jsdoc/api/jsdoc/jsdoc.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/initialize.js b/conf/node_modules/jsdoc/api/jsdoc/lib/initialize.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/initialize.js
rename to conf/node_modules/jsdoc/api/jsdoc/lib/initialize.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/augment.js b/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/augment.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/augment.js
rename to conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/augment.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/borrow.js b/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/borrow.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/borrow.js
rename to conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/borrow.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/config.js b/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/config.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/config.js
rename to conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/config.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/doclet.js b/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/doclet.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/doclet.js
rename to conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/doclet.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/fs.js b/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/fs.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/fs.js
rename to conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/fs.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/name.js b/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/name.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/name.js
rename to conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/name.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/opts/argparser.js b/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/opts/argparser.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/opts/argparser.js
rename to conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/opts/argparser.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/opts/args.js b/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/opts/args.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/opts/args.js
rename to conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/opts/args.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/package.js b/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/package.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/package.js
rename to conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/package.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/path.js b/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/path.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/path.js
rename to conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/path.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/plugins.js b/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/plugins.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/plugins.js
rename to conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/plugins.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/readme.js b/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/readme.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/readme.js
rename to conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/readme.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/schema.js b/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/schema.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/schema.js
rename to conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/schema.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/src/filter.js b/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/src/filter.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/src/filter.js
rename to conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/src/filter.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/src/handlers.js b/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/src/handlers.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/src/handlers.js
rename to conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/src/handlers.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/src/parser.js b/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/src/parser.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/src/parser.js
rename to conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/src/parser.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/src/scanner.js b/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/src/scanner.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/src/scanner.js
rename to conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/src/scanner.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/tag.js b/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/tag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/tag.js
rename to conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/tag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/tag/dictionary.js b/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/tag/dictionary.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/tag/dictionary.js
rename to conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/tag/dictionary.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/tag/dictionary/definitions.js b/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/tag/dictionary/definitions.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/tag/dictionary/definitions.js
rename to conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/tag/dictionary/definitions.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/tag/inline.js b/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/tag/inline.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/tag/inline.js
rename to conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/tag/inline.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/tag/type.js b/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/tag/type.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/tag/type.js
rename to conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/tag/type.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/tag/validator.js b/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/tag/validator.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/tag/validator.js
rename to conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/tag/validator.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/template.js b/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/template.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/template.js
rename to conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/template.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/tutorial.js b/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/tutorial.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/tutorial.js
rename to conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/tutorial.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/tutorial/resolver.js b/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/tutorial/resolver.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/tutorial/resolver.js
rename to conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/tutorial/resolver.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/util/doop.js b/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/util/doop.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/util/doop.js
rename to conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/util/doop.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/util/dumper.js b/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/util/dumper.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/util/dumper.js
rename to conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/util/dumper.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/util/error.js b/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/util/error.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/util/error.js
rename to conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/util/error.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/util/global.js b/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/util/global.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/util/global.js
rename to conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/util/global.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/util/include.js b/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/util/include.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/util/include.js
rename to conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/util/include.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/util/markdown.js b/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/util/markdown.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/util/markdown.js
rename to conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/util/markdown.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/util/templateHelper.js b/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/util/templateHelper.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/util/templateHelper.js
rename to conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/util/templateHelper.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/util/vm.js b/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/util/vm.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/util/vm.js
rename to conf/node_modules/jsdoc/api/jsdoc/lib/jsdoc/util/vm.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/.bin/jshint b/conf/node_modules/jsdoc/api/jsdoc/node_modules/.bin/jshint
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/.bin/jshint
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/.bin/jshint
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/.bin/jshint.cmd b/conf/node_modules/jsdoc/api/jsdoc/node_modules/.bin/jshint.cmd
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/.bin/jshint.cmd
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/.bin/jshint.cmd
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/.bin/marked b/conf/node_modules/jsdoc/api/jsdoc/node_modules/.bin/marked
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/.bin/marked
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/.bin/marked
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/.bin/marked.cmd b/conf/node_modules/jsdoc/api/jsdoc/node_modules/.bin/marked.cmd
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/.bin/marked.cmd
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/.bin/marked.cmd
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/async/.gitmodules b/conf/node_modules/jsdoc/api/jsdoc/node_modules/async/.gitmodules
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/async/.gitmodules
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/async/.gitmodules
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/async/.npmignore b/conf/node_modules/jsdoc/api/jsdoc/node_modules/async/.npmignore
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/async/.npmignore
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/async/.npmignore
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/async/LICENSE b/conf/node_modules/jsdoc/api/jsdoc/node_modules/async/LICENSE
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/async/LICENSE
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/async/LICENSE
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/async/Makefile b/conf/node_modules/jsdoc/api/jsdoc/node_modules/async/Makefile
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/async/Makefile
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/async/Makefile
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/async/README.md b/conf/node_modules/jsdoc/api/jsdoc/node_modules/async/README.md
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/async/README.md
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/async/README.md
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/async/index.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/async/index.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/async/index.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/async/index.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/async/lib/async.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/async/lib/async.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/async/lib/async.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/async/lib/async.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/async/package.json b/conf/node_modules/jsdoc/api/jsdoc/node_modules/async/package.json
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/async/package.json
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/async/package.json
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/catharsis/LICENSE b/conf/node_modules/jsdoc/api/jsdoc/node_modules/catharsis/LICENSE
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/catharsis/LICENSE
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/catharsis/LICENSE
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/catharsis/README.md b/conf/node_modules/jsdoc/api/jsdoc/node_modules/catharsis/README.md
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/catharsis/README.md
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/catharsis/README.md
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/catharsis/bin/parseType.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/catharsis/bin/parseType.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/catharsis/bin/parseType.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/catharsis/bin/parseType.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/catharsis/catharsis.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/catharsis/catharsis.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/catharsis/catharsis.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/catharsis/catharsis.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/catharsis/lib/parser.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/catharsis/lib/parser.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/catharsis/lib/parser.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/catharsis/lib/parser.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/catharsis/lib/stringify.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/catharsis/lib/stringify.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/catharsis/lib/stringify.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/catharsis/lib/stringify.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/catharsis/lib/types.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/catharsis/lib/types.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/catharsis/lib/types.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/catharsis/lib/types.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/catharsis/package.json b/conf/node_modules/jsdoc/api/jsdoc/node_modules/catharsis/package.json
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/catharsis/package.json
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/catharsis/package.json
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/crypto-browserify/example/bundle.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/crypto-browserify/example/bundle.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/crypto-browserify/example/bundle.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/crypto-browserify/example/bundle.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/crypto-browserify/example/index.html b/conf/node_modules/jsdoc/api/jsdoc/node_modules/crypto-browserify/example/index.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/crypto-browserify/example/index.html
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/crypto-browserify/example/index.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/crypto-browserify/example/test.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/crypto-browserify/example/test.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/crypto-browserify/example/test.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/crypto-browserify/example/test.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/crypto-browserify/index.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/crypto-browserify/index.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/crypto-browserify/index.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/crypto-browserify/index.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/crypto-browserify/package.json b/conf/node_modules/jsdoc/api/jsdoc/node_modules/crypto-browserify/package.json
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/crypto-browserify/package.json
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/crypto-browserify/package.json
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/crypto-browserify/readme.markdown b/conf/node_modules/jsdoc/api/jsdoc/node_modules/crypto-browserify/readme.markdown
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/crypto-browserify/readme.markdown
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/crypto-browserify/readme.markdown
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/crypto-browserify/rng.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/crypto-browserify/rng.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/crypto-browserify/rng.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/crypto-browserify/rng.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/crypto-browserify/sha.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/crypto-browserify/sha.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/crypto-browserify/sha.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/crypto-browserify/sha.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/crypto-browserify/test/simple.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/crypto-browserify/test/simple.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/crypto-browserify/test/simple.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/crypto-browserify/test/simple.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/js2xmlparser/.npmignore b/conf/node_modules/jsdoc/api/jsdoc/node_modules/js2xmlparser/.npmignore
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/js2xmlparser/.npmignore
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/js2xmlparser/.npmignore
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/js2xmlparser/LICENSE.md b/conf/node_modules/jsdoc/api/jsdoc/node_modules/js2xmlparser/LICENSE.md
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/js2xmlparser/LICENSE.md
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/js2xmlparser/LICENSE.md
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/js2xmlparser/README.md b/conf/node_modules/jsdoc/api/jsdoc/node_modules/js2xmlparser/README.md
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/js2xmlparser/README.md
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/js2xmlparser/README.md
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/js2xmlparser/example/example.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/js2xmlparser/example/example.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/js2xmlparser/example/example.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/js2xmlparser/example/example.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/js2xmlparser/lib/js2xmlparser.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/js2xmlparser/lib/js2xmlparser.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/js2xmlparser/lib/js2xmlparser.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/js2xmlparser/lib/js2xmlparser.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/js2xmlparser/package.json b/conf/node_modules/jsdoc/api/jsdoc/node_modules/js2xmlparser/package.json
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/js2xmlparser/package.json
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/js2xmlparser/package.json
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/LICENSE b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/LICENSE
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/LICENSE
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/LICENSE
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/README.md b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/README.md
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/README.md
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/README.md
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/bin/hint b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/bin/hint
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/bin/hint
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/bin/hint
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/lib/cli.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/lib/cli.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/lib/cli.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/lib/cli.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/lib/hint.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/lib/hint.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/lib/hint.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/lib/hint.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/lib/reporters/checkstyle.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/lib/reporters/checkstyle.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/lib/reporters/checkstyle.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/lib/reporters/checkstyle.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/lib/reporters/default.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/lib/reporters/default.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/lib/reporters/default.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/lib/reporters/default.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/lib/reporters/jslint_xml.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/lib/reporters/jslint_xml.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/lib/reporters/jslint_xml.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/lib/reporters/jslint_xml.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/lib/reporters/non_error.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/lib/reporters/non_error.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/lib/reporters/non_error.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/lib/reporters/non_error.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/README.md b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/README.md
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/README.md
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/README.md
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/cli.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/cli.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/cli.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/cli.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/examples/cat.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/examples/cat.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/examples/cat.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/examples/cat.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/examples/command.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/examples/command.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/examples/command.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/examples/command.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/examples/echo.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/examples/echo.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/examples/echo.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/examples/echo.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/examples/glob.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/examples/glob.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/examples/glob.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/examples/glob.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/examples/long_desc.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/examples/long_desc.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/examples/long_desc.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/examples/long_desc.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/examples/progress.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/examples/progress.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/examples/progress.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/examples/progress.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/examples/sort.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/examples/sort.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/examples/sort.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/examples/sort.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/examples/spinner.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/examples/spinner.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/examples/spinner.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/examples/spinner.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/examples/static.coffee b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/examples/static.coffee
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/examples/static.coffee
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/examples/static.coffee
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/examples/static.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/examples/static.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/examples/static.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/examples/static.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/index.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/index.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/index.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/index.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/LICENSE b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/LICENSE
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/LICENSE
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/LICENSE
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/README.md b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/README.md
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/README.md
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/README.md
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/common.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/common.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/common.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/common.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/glob.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/glob.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/glob.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/glob.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inflight/.eslintrc b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inflight/.eslintrc
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inflight/.eslintrc
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inflight/.eslintrc
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inflight/LICENSE b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inflight/LICENSE
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inflight/LICENSE
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inflight/LICENSE
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inflight/README.md b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inflight/README.md
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inflight/README.md
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inflight/README.md
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inflight/inflight.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inflight/inflight.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inflight/inflight.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inflight/inflight.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inflight/node_modules/wrappy/LICENSE b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inflight/node_modules/wrappy/LICENSE
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inflight/node_modules/wrappy/LICENSE
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inflight/node_modules/wrappy/LICENSE
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inflight/node_modules/wrappy/README.md b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inflight/node_modules/wrappy/README.md
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inflight/node_modules/wrappy/README.md
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inflight/node_modules/wrappy/README.md
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inflight/node_modules/wrappy/package.json b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inflight/node_modules/wrappy/package.json
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inflight/node_modules/wrappy/package.json
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inflight/node_modules/wrappy/package.json
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inflight/node_modules/wrappy/test/basic.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inflight/node_modules/wrappy/test/basic.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inflight/node_modules/wrappy/test/basic.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inflight/node_modules/wrappy/test/basic.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inflight/node_modules/wrappy/wrappy.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inflight/node_modules/wrappy/wrappy.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inflight/node_modules/wrappy/wrappy.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inflight/node_modules/wrappy/wrappy.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inflight/package.json b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inflight/package.json
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inflight/package.json
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inflight/package.json
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inflight/test.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inflight/test.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inflight/test.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inflight/test.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inherits/LICENSE b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inherits/LICENSE
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inherits/LICENSE
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inherits/LICENSE
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inherits/README.md b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inherits/README.md
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inherits/README.md
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inherits/README.md
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inherits/inherits.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inherits/inherits.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inherits/inherits.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inherits/inherits.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inherits/inherits_browser.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inherits/inherits_browser.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inherits/inherits_browser.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inherits/inherits_browser.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inherits/package.json b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inherits/package.json
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inherits/package.json
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inherits/package.json
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inherits/test.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inherits/test.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inherits/test.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inherits/test.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/LICENSE b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/LICENSE
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/LICENSE
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/LICENSE
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/README.md b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/README.md
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/README.md
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/README.md
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/browser.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/browser.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/browser.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/browser.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/minimatch.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/minimatch.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/minimatch.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/minimatch.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/.npmignore b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/.npmignore
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/.npmignore
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/.npmignore
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/.travis.yml b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/.travis.yml
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/.travis.yml
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/.travis.yml
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/README.md b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/README.md
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/README.md
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/README.md
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/example.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/example.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/example.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/example.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/index.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/index.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/index.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/index.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/.npmignore b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/.npmignore
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/.npmignore
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/.npmignore
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/.travis.yml b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/.travis.yml
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/.travis.yml
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/.travis.yml
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/Makefile b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/Makefile
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/Makefile
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/Makefile
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/README.md b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/README.md
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/README.md
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/README.md
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/example.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/example.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/example.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/example.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/index.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/index.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/index.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/index.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/package.json b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/package.json
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/package.json
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/package.json
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/.travis.yml b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/.travis.yml
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/.travis.yml
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/.travis.yml
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/LICENSE b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/LICENSE
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/LICENSE
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/LICENSE
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/README.markdown b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/README.markdown
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/README.markdown
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/README.markdown
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/index.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/index.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/index.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/index.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/package.json b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/package.json
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/package.json
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/package.json
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/test/map.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/test/map.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/test/map.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/test/map.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/package.json b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/package.json
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/package.json
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/package.json
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/bash-comparison.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/bash-comparison.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/bash-comparison.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/bash-comparison.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/bash-results.txt b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/bash-results.txt
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/bash-results.txt
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/bash-results.txt
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/cases.txt b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/cases.txt
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/cases.txt
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/cases.txt
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/dollar.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/dollar.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/dollar.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/dollar.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/empty-option.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/empty-option.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/empty-option.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/empty-option.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/generate.sh b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/generate.sh
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/generate.sh
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/generate.sh
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/negative-increment.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/negative-increment.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/negative-increment.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/negative-increment.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/nested.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/nested.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/nested.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/nested.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/order.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/order.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/order.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/order.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/pad.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/pad.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/pad.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/pad.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/same-type.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/same-type.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/same-type.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/same-type.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/sequence.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/sequence.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/sequence.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/sequence.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/package.json b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/package.json
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/package.json
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/package.json
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/once/LICENSE b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/once/LICENSE
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/once/LICENSE
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/once/LICENSE
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/once/README.md b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/once/README.md
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/once/README.md
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/once/README.md
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/once/node_modules/wrappy/LICENSE b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/once/node_modules/wrappy/LICENSE
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/once/node_modules/wrappy/LICENSE
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/once/node_modules/wrappy/LICENSE
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/once/node_modules/wrappy/README.md b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/once/node_modules/wrappy/README.md
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/once/node_modules/wrappy/README.md
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/once/node_modules/wrappy/README.md
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/once/node_modules/wrappy/package.json b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/once/node_modules/wrappy/package.json
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/once/node_modules/wrappy/package.json
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/once/node_modules/wrappy/package.json
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/once/node_modules/wrappy/test/basic.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/once/node_modules/wrappy/test/basic.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/once/node_modules/wrappy/test/basic.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/once/node_modules/wrappy/test/basic.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/once/node_modules/wrappy/wrappy.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/once/node_modules/wrappy/wrappy.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/once/node_modules/wrappy/wrappy.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/once/node_modules/wrappy/wrappy.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/once/once.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/once/once.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/once/once.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/once/once.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/once/package.json b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/once/package.json
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/once/package.json
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/once/package.json
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/once/test/once.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/once/test/once.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/once/test/once.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/once/test/once.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/path-is-absolute/index.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/path-is-absolute/index.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/path-is-absolute/index.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/path-is-absolute/index.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/path-is-absolute/license b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/path-is-absolute/license
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/path-is-absolute/license
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/path-is-absolute/license
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/path-is-absolute/package.json b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/path-is-absolute/package.json
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/path-is-absolute/package.json
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/path-is-absolute/package.json
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/path-is-absolute/readme.md b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/path-is-absolute/readme.md
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/path-is-absolute/readme.md
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/path-is-absolute/readme.md
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/package.json b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/package.json
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/package.json
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/package.json
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/sync.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/sync.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/sync.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/node_modules/glob/sync.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/package.json b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/package.json
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/package.json
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/cli/package.json
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/minimatch/.travis.yml b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/minimatch/.travis.yml
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/minimatch/.travis.yml
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/minimatch/.travis.yml
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/minimatch/LICENSE b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/minimatch/LICENSE
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/minimatch/LICENSE
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/minimatch/LICENSE
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/minimatch/README.md b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/minimatch/README.md
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/minimatch/README.md
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/minimatch/README.md
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/minimatch/blerg.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/minimatch/blerg.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/minimatch/blerg.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/minimatch/blerg.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/minimatch/minimatch.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/minimatch/minimatch.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/minimatch/minimatch.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/minimatch/minimatch.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/minimatch/node_modules/lru-cache/.npmignore b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/minimatch/node_modules/lru-cache/.npmignore
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/minimatch/node_modules/lru-cache/.npmignore
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/minimatch/node_modules/lru-cache/.npmignore
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/minimatch/node_modules/lru-cache/LICENSE b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/minimatch/node_modules/lru-cache/LICENSE
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/minimatch/node_modules/lru-cache/LICENSE
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/minimatch/node_modules/lru-cache/LICENSE
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/minimatch/node_modules/lru-cache/README.md b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/minimatch/node_modules/lru-cache/README.md
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/minimatch/node_modules/lru-cache/README.md
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/minimatch/node_modules/lru-cache/README.md
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/minimatch/node_modules/lru-cache/lib/lru-cache.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/minimatch/node_modules/lru-cache/lib/lru-cache.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/minimatch/node_modules/lru-cache/lib/lru-cache.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/minimatch/node_modules/lru-cache/lib/lru-cache.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/minimatch/node_modules/lru-cache/package.json b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/minimatch/node_modules/lru-cache/package.json
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/minimatch/node_modules/lru-cache/package.json
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/minimatch/node_modules/lru-cache/package.json
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/minimatch/node_modules/lru-cache/test/basic.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/minimatch/node_modules/lru-cache/test/basic.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/minimatch/node_modules/lru-cache/test/basic.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/minimatch/node_modules/lru-cache/test/basic.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/minimatch/package.json b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/minimatch/package.json
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/minimatch/package.json
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/minimatch/package.json
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/minimatch/t.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/minimatch/t.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/minimatch/t.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/minimatch/t.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/minimatch/test/basic.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/minimatch/test/basic.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/minimatch/test/basic.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/node_modules/minimatch/test/basic.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/package.json b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/package.json
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/package.json
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/package.json
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/packages/jshint/README.md b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/packages/jshint/README.md
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/packages/jshint/README.md
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/packages/jshint/README.md
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/packages/jshint/jshint.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/packages/jshint/jshint.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/packages/jshint/jshint.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/jshint/packages/jshint/jshint.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/marked/.npmignore b/conf/node_modules/jsdoc/api/jsdoc/node_modules/marked/.npmignore
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/marked/.npmignore
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/marked/.npmignore
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/marked/LICENSE b/conf/node_modules/jsdoc/api/jsdoc/node_modules/marked/LICENSE
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/marked/LICENSE
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/marked/LICENSE
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/marked/Makefile b/conf/node_modules/jsdoc/api/jsdoc/node_modules/marked/Makefile
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/marked/Makefile
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/marked/Makefile
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/marked/README.md b/conf/node_modules/jsdoc/api/jsdoc/node_modules/marked/README.md
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/marked/README.md
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/marked/README.md
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/marked/bin/marked b/conf/node_modules/jsdoc/api/jsdoc/node_modules/marked/bin/marked
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/marked/bin/marked
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/marked/bin/marked
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/marked/index.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/marked/index.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/marked/index.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/marked/index.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/marked/lib/marked.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/marked/lib/marked.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/marked/lib/marked.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/marked/lib/marked.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/marked/man/marked.1 b/conf/node_modules/jsdoc/api/jsdoc/node_modules/marked/man/marked.1
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/marked/man/marked.1
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/marked/man/marked.1
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/marked/package.json b/conf/node_modules/jsdoc/api/jsdoc/node_modules/marked/package.json
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/marked/package.json
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/marked/package.json
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/taffydb/README.md b/conf/node_modules/jsdoc/api/jsdoc/node_modules/taffydb/README.md
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/taffydb/README.md
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/taffydb/README.md
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/taffydb/package.json b/conf/node_modules/jsdoc/api/jsdoc/node_modules/taffydb/package.json
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/taffydb/package.json
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/taffydb/package.json
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/taffydb/taffy-test.html b/conf/node_modules/jsdoc/api/jsdoc/node_modules/taffydb/taffy-test.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/taffydb/taffy-test.html
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/taffydb/taffy-test.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/taffydb/taffy.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/taffydb/taffy.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/taffydb/taffy.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/taffydb/taffy.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/underscore/.npmignore b/conf/node_modules/jsdoc/api/jsdoc/node_modules/underscore/.npmignore
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/underscore/.npmignore
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/underscore/.npmignore
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/underscore/CNAME b/conf/node_modules/jsdoc/api/jsdoc/node_modules/underscore/CNAME
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/underscore/CNAME
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/underscore/CNAME
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/underscore/CONTRIBUTING.md b/conf/node_modules/jsdoc/api/jsdoc/node_modules/underscore/CONTRIBUTING.md
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/underscore/CONTRIBUTING.md
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/underscore/CONTRIBUTING.md
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/underscore/LICENSE b/conf/node_modules/jsdoc/api/jsdoc/node_modules/underscore/LICENSE
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/underscore/LICENSE
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/underscore/LICENSE
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/underscore/README.md b/conf/node_modules/jsdoc/api/jsdoc/node_modules/underscore/README.md
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/underscore/README.md
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/underscore/README.md
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/underscore/favicon.ico b/conf/node_modules/jsdoc/api/jsdoc/node_modules/underscore/favicon.ico
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/underscore/favicon.ico
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/underscore/favicon.ico
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/underscore/index.html b/conf/node_modules/jsdoc/api/jsdoc/node_modules/underscore/index.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/underscore/index.html
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/underscore/index.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/underscore/index.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/underscore/index.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/underscore/index.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/underscore/index.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/underscore/package.json b/conf/node_modules/jsdoc/api/jsdoc/node_modules/underscore/package.json
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/underscore/package.json
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/underscore/package.json
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/underscore/raw/underscore.psd b/conf/node_modules/jsdoc/api/jsdoc/node_modules/underscore/raw/underscore.psd
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/underscore/raw/underscore.psd
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/underscore/raw/underscore.psd
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/underscore/underscore-min.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/underscore/underscore-min.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/underscore/underscore-min.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/underscore/underscore-min.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/underscore/underscore.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/underscore/underscore.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/underscore/underscore.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/underscore/underscore.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/wrench/.npmignore b/conf/node_modules/jsdoc/api/jsdoc/node_modules/wrench/.npmignore
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/wrench/.npmignore
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/wrench/.npmignore
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/wrench/LICENSE b/conf/node_modules/jsdoc/api/jsdoc/node_modules/wrench/LICENSE
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/wrench/LICENSE
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/wrench/LICENSE
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/wrench/lib/wrench.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/wrench/lib/wrench.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/wrench/lib/wrench.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/wrench/lib/wrench.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/wrench/lib/x.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/wrench/lib/x.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/wrench/lib/x.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/wrench/lib/x.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/wrench/package.json b/conf/node_modules/jsdoc/api/jsdoc/node_modules/wrench/package.json
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/wrench/package.json
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/wrench/package.json
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/wrench/readme.md b/conf/node_modules/jsdoc/api/jsdoc/node_modules/wrench/readme.md
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/wrench/readme.md
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/wrench/readme.md
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/wrench/tests/mkdir.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/wrench/tests/mkdir.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/wrench/tests/mkdir.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/wrench/tests/mkdir.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/wrench/tests/readdir.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/wrench/tests/readdir.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/wrench/tests/readdir.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/wrench/tests/readdir.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/wrench/tests/readdir/bar.txt b/conf/node_modules/jsdoc/api/jsdoc/node_modules/wrench/tests/readdir/bar.txt
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/wrench/tests/readdir/bar.txt
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/wrench/tests/readdir/bar.txt
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/wrench/tests/readdir/foo/bar/ipsum.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/wrench/tests/readdir/foo/bar/ipsum.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/wrench/tests/readdir/foo/bar/ipsum.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/wrench/tests/readdir/foo/bar/ipsum.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/wrench/tests/readdir/foo/dolor.md b/conf/node_modules/jsdoc/api/jsdoc/node_modules/wrench/tests/readdir/foo/dolor.md
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/wrench/tests/readdir/foo/dolor.md
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/wrench/tests/readdir/foo/dolor.md
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/wrench/tests/readdir/foo/lorem.txt b/conf/node_modules/jsdoc/api/jsdoc/node_modules/wrench/tests/readdir/foo/lorem.txt
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/wrench/tests/readdir/foo/lorem.txt
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/wrench/tests/readdir/foo/lorem.txt
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/wrench/tests/runner.js b/conf/node_modules/jsdoc/api/jsdoc/node_modules/wrench/tests/runner.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/node_modules/wrench/tests/runner.js
rename to conf/node_modules/jsdoc/api/jsdoc/node_modules/wrench/tests/runner.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/nodejs/bin/jsdoc b/conf/node_modules/jsdoc/api/jsdoc/nodejs/bin/jsdoc
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/nodejs/bin/jsdoc
rename to conf/node_modules/jsdoc/api/jsdoc/nodejs/bin/jsdoc
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/nodejs/jsdoc/fs.js b/conf/node_modules/jsdoc/api/jsdoc/nodejs/jsdoc/fs.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/nodejs/jsdoc/fs.js
rename to conf/node_modules/jsdoc/api/jsdoc/nodejs/jsdoc/fs.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/nodejs/jsdoc/util/include.js b/conf/node_modules/jsdoc/api/jsdoc/nodejs/jsdoc/util/include.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/nodejs/jsdoc/util/include.js
rename to conf/node_modules/jsdoc/api/jsdoc/nodejs/jsdoc/util/include.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/package.json b/conf/node_modules/jsdoc/api/jsdoc/package.json
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/package.json
rename to conf/node_modules/jsdoc/api/jsdoc/package.json
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/plugins/README.md b/conf/node_modules/jsdoc/api/jsdoc/plugins/README.md
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/plugins/README.md
rename to conf/node_modules/jsdoc/api/jsdoc/plugins/README.md
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/plugins/commentConvert.js b/conf/node_modules/jsdoc/api/jsdoc/plugins/commentConvert.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/plugins/commentConvert.js
rename to conf/node_modules/jsdoc/api/jsdoc/plugins/commentConvert.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/plugins/commentsOnly.js b/conf/node_modules/jsdoc/api/jsdoc/plugins/commentsOnly.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/plugins/commentsOnly.js
rename to conf/node_modules/jsdoc/api/jsdoc/plugins/commentsOnly.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/plugins/escapeHtml.js b/conf/node_modules/jsdoc/api/jsdoc/plugins/escapeHtml.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/plugins/escapeHtml.js
rename to conf/node_modules/jsdoc/api/jsdoc/plugins/escapeHtml.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/plugins/eventDumper.js b/conf/node_modules/jsdoc/api/jsdoc/plugins/eventDumper.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/plugins/eventDumper.js
rename to conf/node_modules/jsdoc/api/jsdoc/plugins/eventDumper.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/plugins/markdown.js b/conf/node_modules/jsdoc/api/jsdoc/plugins/markdown.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/plugins/markdown.js
rename to conf/node_modules/jsdoc/api/jsdoc/plugins/markdown.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/plugins/overloadHelper.js b/conf/node_modules/jsdoc/api/jsdoc/plugins/overloadHelper.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/plugins/overloadHelper.js
rename to conf/node_modules/jsdoc/api/jsdoc/plugins/overloadHelper.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/plugins/partial.js b/conf/node_modules/jsdoc/api/jsdoc/plugins/partial.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/plugins/partial.js
rename to conf/node_modules/jsdoc/api/jsdoc/plugins/partial.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/plugins/railsTemplate.js b/conf/node_modules/jsdoc/api/jsdoc/plugins/railsTemplate.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/plugins/railsTemplate.js
rename to conf/node_modules/jsdoc/api/jsdoc/plugins/railsTemplate.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/plugins/shout.js b/conf/node_modules/jsdoc/api/jsdoc/plugins/shout.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/plugins/shout.js
rename to conf/node_modules/jsdoc/api/jsdoc/plugins/shout.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/plugins/sourcetag.js b/conf/node_modules/jsdoc/api/jsdoc/plugins/sourcetag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/plugins/sourcetag.js
rename to conf/node_modules/jsdoc/api/jsdoc/plugins/sourcetag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/plugins/test/fixtures/overloadHelper.js b/conf/node_modules/jsdoc/api/jsdoc/plugins/test/fixtures/overloadHelper.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/plugins/test/fixtures/overloadHelper.js
rename to conf/node_modules/jsdoc/api/jsdoc/plugins/test/fixtures/overloadHelper.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/plugins/test/fixtures/railsTemplate.js.erb b/conf/node_modules/jsdoc/api/jsdoc/plugins/test/fixtures/railsTemplate.js.erb
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/plugins/test/fixtures/railsTemplate.js.erb
rename to conf/node_modules/jsdoc/api/jsdoc/plugins/test/fixtures/railsTemplate.js.erb
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/plugins/test/fixtures/seetag-markdown.js b/conf/node_modules/jsdoc/api/jsdoc/plugins/test/fixtures/seetag-markdown.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/plugins/test/fixtures/seetag-markdown.js
rename to conf/node_modules/jsdoc/api/jsdoc/plugins/test/fixtures/seetag-markdown.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/plugins/test/specs/commentConvert.js b/conf/node_modules/jsdoc/api/jsdoc/plugins/test/specs/commentConvert.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/plugins/test/specs/commentConvert.js
rename to conf/node_modules/jsdoc/api/jsdoc/plugins/test/specs/commentConvert.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/plugins/test/specs/escapeHtml.js b/conf/node_modules/jsdoc/api/jsdoc/plugins/test/specs/escapeHtml.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/plugins/test/specs/escapeHtml.js
rename to conf/node_modules/jsdoc/api/jsdoc/plugins/test/specs/escapeHtml.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/plugins/test/specs/markdown.js b/conf/node_modules/jsdoc/api/jsdoc/plugins/test/specs/markdown.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/plugins/test/specs/markdown.js
rename to conf/node_modules/jsdoc/api/jsdoc/plugins/test/specs/markdown.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/plugins/test/specs/overloadHelper.js b/conf/node_modules/jsdoc/api/jsdoc/plugins/test/specs/overloadHelper.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/plugins/test/specs/overloadHelper.js
rename to conf/node_modules/jsdoc/api/jsdoc/plugins/test/specs/overloadHelper.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/plugins/test/specs/railsTemplate.js b/conf/node_modules/jsdoc/api/jsdoc/plugins/test/specs/railsTemplate.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/plugins/test/specs/railsTemplate.js
rename to conf/node_modules/jsdoc/api/jsdoc/plugins/test/specs/railsTemplate.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/plugins/test/specs/shout.js b/conf/node_modules/jsdoc/api/jsdoc/plugins/test/specs/shout.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/plugins/test/specs/shout.js
rename to conf/node_modules/jsdoc/api/jsdoc/plugins/test/specs/shout.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/plugins/test/specs/sourcetag.js b/conf/node_modules/jsdoc/api/jsdoc/plugins/test/specs/sourcetag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/plugins/test/specs/sourcetag.js
rename to conf/node_modules/jsdoc/api/jsdoc/plugins/test/specs/sourcetag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/plugins/test/specs/verboseOutput.js b/conf/node_modules/jsdoc/api/jsdoc/plugins/test/specs/verboseOutput.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/plugins/test/specs/verboseOutput.js
rename to conf/node_modules/jsdoc/api/jsdoc/plugins/test/specs/verboseOutput.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/plugins/verboseOutput.js b/conf/node_modules/jsdoc/api/jsdoc/plugins/verboseOutput.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/plugins/verboseOutput.js
rename to conf/node_modules/jsdoc/api/jsdoc/plugins/verboseOutput.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/rhino/MPL_1.1.txt b/conf/node_modules/jsdoc/api/jsdoc/rhino/MPL_1.1.txt
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/rhino/MPL_1.1.txt
rename to conf/node_modules/jsdoc/api/jsdoc/rhino/MPL_1.1.txt
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/rhino/crypto.js b/conf/node_modules/jsdoc/api/jsdoc/rhino/crypto.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/rhino/crypto.js
rename to conf/node_modules/jsdoc/api/jsdoc/rhino/crypto.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/rhino/events.js b/conf/node_modules/jsdoc/api/jsdoc/rhino/events.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/rhino/events.js
rename to conf/node_modules/jsdoc/api/jsdoc/rhino/events.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/rhino/fs.js b/conf/node_modules/jsdoc/api/jsdoc/rhino/fs.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/rhino/fs.js
rename to conf/node_modules/jsdoc/api/jsdoc/rhino/fs.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/rhino/js.jar b/conf/node_modules/jsdoc/api/jsdoc/rhino/js.jar
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/rhino/js.jar
rename to conf/node_modules/jsdoc/api/jsdoc/rhino/js.jar
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/rhino/jsdoc.js b/conf/node_modules/jsdoc/api/jsdoc/rhino/jsdoc.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/rhino/jsdoc.js
rename to conf/node_modules/jsdoc/api/jsdoc/rhino/jsdoc.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/rhino/jsdoc/util/include.js b/conf/node_modules/jsdoc/api/jsdoc/rhino/jsdoc/util/include.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/rhino/jsdoc/util/include.js
rename to conf/node_modules/jsdoc/api/jsdoc/rhino/jsdoc/util/include.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/rhino/os.js b/conf/node_modules/jsdoc/api/jsdoc/rhino/os.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/rhino/os.js
rename to conf/node_modules/jsdoc/api/jsdoc/rhino/os.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/rhino/path.js b/conf/node_modules/jsdoc/api/jsdoc/rhino/path.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/rhino/path.js
rename to conf/node_modules/jsdoc/api/jsdoc/rhino/path.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/rhino/querystring.js b/conf/node_modules/jsdoc/api/jsdoc/rhino/querystring.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/rhino/querystring.js
rename to conf/node_modules/jsdoc/api/jsdoc/rhino/querystring.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/rhino/rhino-shim.js b/conf/node_modules/jsdoc/api/jsdoc/rhino/rhino-shim.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/rhino/rhino-shim.js
rename to conf/node_modules/jsdoc/api/jsdoc/rhino/rhino-shim.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/rhino/util.js b/conf/node_modules/jsdoc/api/jsdoc/rhino/util.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/rhino/util.js
rename to conf/node_modules/jsdoc/api/jsdoc/rhino/util.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/templates/README.md b/conf/node_modules/jsdoc/api/jsdoc/templates/README.md
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/templates/README.md
rename to conf/node_modules/jsdoc/api/jsdoc/templates/README.md
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/templates/default/README.md b/conf/node_modules/jsdoc/api/jsdoc/templates/default/README.md
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/templates/default/README.md
rename to conf/node_modules/jsdoc/api/jsdoc/templates/default/README.md
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/templates/default/publish.js b/conf/node_modules/jsdoc/api/jsdoc/templates/default/publish.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/templates/default/publish.js
rename to conf/node_modules/jsdoc/api/jsdoc/templates/default/publish.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/templates/default/static/scripts/linenumber.js b/conf/node_modules/jsdoc/api/jsdoc/templates/default/static/scripts/linenumber.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/templates/default/static/scripts/linenumber.js
rename to conf/node_modules/jsdoc/api/jsdoc/templates/default/static/scripts/linenumber.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/templates/default/static/scripts/prettify/Apache-License-2.0.txt b/conf/node_modules/jsdoc/api/jsdoc/templates/default/static/scripts/prettify/Apache-License-2.0.txt
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/templates/default/static/scripts/prettify/Apache-License-2.0.txt
rename to conf/node_modules/jsdoc/api/jsdoc/templates/default/static/scripts/prettify/Apache-License-2.0.txt
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/templates/default/static/scripts/prettify/lang-css.js b/conf/node_modules/jsdoc/api/jsdoc/templates/default/static/scripts/prettify/lang-css.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/templates/default/static/scripts/prettify/lang-css.js
rename to conf/node_modules/jsdoc/api/jsdoc/templates/default/static/scripts/prettify/lang-css.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/templates/default/static/scripts/prettify/prettify.js b/conf/node_modules/jsdoc/api/jsdoc/templates/default/static/scripts/prettify/prettify.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/templates/default/static/scripts/prettify/prettify.js
rename to conf/node_modules/jsdoc/api/jsdoc/templates/default/static/scripts/prettify/prettify.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/templates/default/static/styles/jsdoc-default.css b/conf/node_modules/jsdoc/api/jsdoc/templates/default/static/styles/jsdoc-default.css
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/templates/default/static/styles/jsdoc-default.css
rename to conf/node_modules/jsdoc/api/jsdoc/templates/default/static/styles/jsdoc-default.css
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/templates/default/static/styles/prettify-jsdoc.css b/conf/node_modules/jsdoc/api/jsdoc/templates/default/static/styles/prettify-jsdoc.css
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/templates/default/static/styles/prettify-jsdoc.css
rename to conf/node_modules/jsdoc/api/jsdoc/templates/default/static/styles/prettify-jsdoc.css
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/templates/default/static/styles/prettify-tomorrow.css b/conf/node_modules/jsdoc/api/jsdoc/templates/default/static/styles/prettify-tomorrow.css
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/templates/default/static/styles/prettify-tomorrow.css
rename to conf/node_modules/jsdoc/api/jsdoc/templates/default/static/styles/prettify-tomorrow.css
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/templates/default/tmpl/container.tmpl b/conf/node_modules/jsdoc/api/jsdoc/templates/default/tmpl/container.tmpl
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/templates/default/tmpl/container.tmpl
rename to conf/node_modules/jsdoc/api/jsdoc/templates/default/tmpl/container.tmpl
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/templates/default/tmpl/details.tmpl b/conf/node_modules/jsdoc/api/jsdoc/templates/default/tmpl/details.tmpl
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/templates/default/tmpl/details.tmpl
rename to conf/node_modules/jsdoc/api/jsdoc/templates/default/tmpl/details.tmpl
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/templates/default/tmpl/example.tmpl b/conf/node_modules/jsdoc/api/jsdoc/templates/default/tmpl/example.tmpl
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/templates/default/tmpl/example.tmpl
rename to conf/node_modules/jsdoc/api/jsdoc/templates/default/tmpl/example.tmpl
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/templates/default/tmpl/examples.tmpl b/conf/node_modules/jsdoc/api/jsdoc/templates/default/tmpl/examples.tmpl
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/templates/default/tmpl/examples.tmpl
rename to conf/node_modules/jsdoc/api/jsdoc/templates/default/tmpl/examples.tmpl
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/templates/default/tmpl/exceptions.tmpl b/conf/node_modules/jsdoc/api/jsdoc/templates/default/tmpl/exceptions.tmpl
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/templates/default/tmpl/exceptions.tmpl
rename to conf/node_modules/jsdoc/api/jsdoc/templates/default/tmpl/exceptions.tmpl
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/templates/default/tmpl/layout.tmpl b/conf/node_modules/jsdoc/api/jsdoc/templates/default/tmpl/layout.tmpl
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/templates/default/tmpl/layout.tmpl
rename to conf/node_modules/jsdoc/api/jsdoc/templates/default/tmpl/layout.tmpl
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/templates/default/tmpl/mainpage.tmpl b/conf/node_modules/jsdoc/api/jsdoc/templates/default/tmpl/mainpage.tmpl
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/templates/default/tmpl/mainpage.tmpl
rename to conf/node_modules/jsdoc/api/jsdoc/templates/default/tmpl/mainpage.tmpl
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/templates/default/tmpl/members.tmpl b/conf/node_modules/jsdoc/api/jsdoc/templates/default/tmpl/members.tmpl
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/templates/default/tmpl/members.tmpl
rename to conf/node_modules/jsdoc/api/jsdoc/templates/default/tmpl/members.tmpl
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/templates/default/tmpl/method.tmpl b/conf/node_modules/jsdoc/api/jsdoc/templates/default/tmpl/method.tmpl
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/templates/default/tmpl/method.tmpl
rename to conf/node_modules/jsdoc/api/jsdoc/templates/default/tmpl/method.tmpl
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/templates/default/tmpl/params.tmpl b/conf/node_modules/jsdoc/api/jsdoc/templates/default/tmpl/params.tmpl
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/templates/default/tmpl/params.tmpl
rename to conf/node_modules/jsdoc/api/jsdoc/templates/default/tmpl/params.tmpl
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/templates/default/tmpl/properties.tmpl b/conf/node_modules/jsdoc/api/jsdoc/templates/default/tmpl/properties.tmpl
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/templates/default/tmpl/properties.tmpl
rename to conf/node_modules/jsdoc/api/jsdoc/templates/default/tmpl/properties.tmpl
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/templates/default/tmpl/returns.tmpl b/conf/node_modules/jsdoc/api/jsdoc/templates/default/tmpl/returns.tmpl
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/templates/default/tmpl/returns.tmpl
rename to conf/node_modules/jsdoc/api/jsdoc/templates/default/tmpl/returns.tmpl
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/templates/default/tmpl/source.tmpl b/conf/node_modules/jsdoc/api/jsdoc/templates/default/tmpl/source.tmpl
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/templates/default/tmpl/source.tmpl
rename to conf/node_modules/jsdoc/api/jsdoc/templates/default/tmpl/source.tmpl
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/templates/default/tmpl/tutorial.tmpl b/conf/node_modules/jsdoc/api/jsdoc/templates/default/tmpl/tutorial.tmpl
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/templates/default/tmpl/tutorial.tmpl
rename to conf/node_modules/jsdoc/api/jsdoc/templates/default/tmpl/tutorial.tmpl
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/templates/default/tmpl/type.tmpl b/conf/node_modules/jsdoc/api/jsdoc/templates/default/tmpl/type.tmpl
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/templates/default/tmpl/type.tmpl
rename to conf/node_modules/jsdoc/api/jsdoc/templates/default/tmpl/type.tmpl
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/templates/haruki/README.md b/conf/node_modules/jsdoc/api/jsdoc/templates/haruki/README.md
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/templates/haruki/README.md
rename to conf/node_modules/jsdoc/api/jsdoc/templates/haruki/README.md
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/templates/haruki/publish.js b/conf/node_modules/jsdoc/api/jsdoc/templates/haruki/publish.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/templates/haruki/publish.js
rename to conf/node_modules/jsdoc/api/jsdoc/templates/haruki/publish.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/README.md b/conf/node_modules/jsdoc/api/jsdoc/test/README.md
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/README.md
rename to conf/node_modules/jsdoc/api/jsdoc/test/README.md
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/async-callback.js b/conf/node_modules/jsdoc/api/jsdoc/test/async-callback.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/async-callback.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/async-callback.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/abstracttag.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/abstracttag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/abstracttag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/abstracttag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/accesstag.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/accesstag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/accesstag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/accesstag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/alias.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/alias.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/alias.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/alias.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/alias2.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/alias2.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/alias2.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/alias2.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/alias3.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/alias3.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/alias3.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/alias3.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/aliasglobal.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/aliasglobal.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/aliasglobal.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/aliasglobal.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/aliasglobal2.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/aliasglobal2.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/aliasglobal2.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/aliasglobal2.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/aliasresolve.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/aliasresolve.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/aliasresolve.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/aliasresolve.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/aliasresolve2.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/aliasresolve2.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/aliasresolve2.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/aliasresolve2.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/also.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/also.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/also.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/also.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/augmentstag.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/augmentstag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/augmentstag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/augmentstag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/augmentstag2.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/augmentstag2.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/augmentstag2.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/augmentstag2.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/augmentstag3.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/augmentstag3.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/augmentstag3.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/augmentstag3.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/augmentstag4.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/augmentstag4.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/augmentstag4.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/augmentstag4.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/authortag.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/authortag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/authortag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/authortag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/borrowstag.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/borrowstag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/borrowstag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/borrowstag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/borrowstag2.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/borrowstag2.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/borrowstag2.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/borrowstag2.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/callbacktag.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/callbacktag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/callbacktag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/callbacktag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/classdesctag.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/classdesctag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/classdesctag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/classdesctag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/classtag.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/classtag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/classtag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/classtag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/constanttag.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/constanttag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/constanttag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/constanttag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/constructortag.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/constructortag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/constructortag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/constructortag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/constructstag.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/constructstag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/constructstag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/constructstag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/constructstag2.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/constructstag2.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/constructstag2.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/constructstag2.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/constructstag3.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/constructstag3.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/constructstag3.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/constructstag3.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/constructstag4.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/constructstag4.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/constructstag4.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/constructstag4.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/constructstag5.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/constructstag5.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/constructstag5.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/constructstag5.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/copyrighttag.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/copyrighttag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/copyrighttag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/copyrighttag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/defaulttag.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/defaulttag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/defaulttag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/defaulttag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/deprecatedtag.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/deprecatedtag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/deprecatedtag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/deprecatedtag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/descriptiontag.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/descriptiontag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/descriptiontag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/descriptiontag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/destructuring.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/destructuring.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/destructuring.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/destructuring.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/doclet.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/doclet.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/doclet.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/doclet.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/enumtag.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/enumtag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/enumtag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/enumtag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/eventfirestag.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/eventfirestag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/eventfirestag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/eventfirestag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/exampletag.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/exampletag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/exampletag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/exampletag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/exceptiontag.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/exceptiontag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/exceptiontag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/exceptiontag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/exports.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/exports.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/exports.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/exports.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/exportstag.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/exportstag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/exportstag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/exportstag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/exportstag2.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/exportstag2.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/exportstag2.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/exportstag2.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/exportstag3.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/exportstag3.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/exportstag3.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/exportstag3.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/exportstag4.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/exportstag4.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/exportstag4.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/exportstag4.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/exportstag5.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/exportstag5.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/exportstag5.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/exportstag5.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/externals.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/externals.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/externals.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/externals.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/externals2.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/externals2.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/externals2.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/externals2.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/file.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/file.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/file.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/file.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/functiontag.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/functiontag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/functiontag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/functiontag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/getset.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/getset.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/getset.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/getset.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/globaltag.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/globaltag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/globaltag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/globaltag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/ignoretag.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/ignoretag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/ignoretag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/ignoretag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/ignoretag2.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/ignoretag2.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/ignoretag2.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/ignoretag2.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/include.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/include.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/include.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/include.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/inlinecomment.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/inlinecomment.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/inlinecomment.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/inlinecomment.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/inner.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/inner.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/inner.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/inner.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/innerscope.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/innerscope.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/innerscope.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/innerscope.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/innerscope2.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/innerscope2.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/innerscope2.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/innerscope2.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/jshint/badfile.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/jshint/badfile.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/jshint/badfile.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/jshint/badfile.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/jshint/goodfile.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/jshint/goodfile.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/jshint/goodfile.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/jshint/goodfile.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/jslangnames.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/jslangnames.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/jslangnames.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/jslangnames.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/kindtag.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/kindtag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/kindtag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/kindtag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/lends.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/lends.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/lends.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/lends.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/lends2.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/lends2.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/lends2.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/lends2.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/lends3.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/lends3.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/lends3.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/lends3.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/lendsglobal.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/lendsglobal.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/lendsglobal.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/lendsglobal.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/letkeyword.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/letkeyword.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/letkeyword.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/letkeyword.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/licensetag.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/licensetag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/licensetag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/licensetag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/linktag.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/linktag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/linktag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/linktag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/listenstag.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/listenstag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/listenstag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/listenstag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/markdowntest.md b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/markdowntest.md
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/markdowntest.md
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/markdowntest.md
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/memberoftag.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/memberoftag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/memberoftag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/memberoftag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/memberoftag2.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/memberoftag2.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/memberoftag2.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/memberoftag2.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/memberoftag3.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/memberoftag3.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/memberoftag3.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/memberoftag3.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/memberoftag4.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/memberoftag4.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/memberoftag4.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/memberoftag4.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/memberoftagforced.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/memberoftagforced.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/memberoftagforced.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/memberoftagforced.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/membertag.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/membertag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/membertag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/membertag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/mixintag.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/mixintag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/mixintag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/mixintag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/moduleinner.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/moduleinner.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/moduleinner.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/moduleinner.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/moduleisconstructor.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/moduleisconstructor.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/moduleisconstructor.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/moduleisconstructor.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/moduleisfunction.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/moduleisfunction.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/moduleisfunction.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/moduleisfunction.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/modules/data/mod-1.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/modules/data/mod-1.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/modules/data/mod-1.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/modules/data/mod-1.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/modules/data/mod-2.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/modules/data/mod-2.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/modules/data/mod-2.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/modules/data/mod-2.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/modules/data/mod-3.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/modules/data/mod-3.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/modules/data/mod-3.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/modules/data/mod-3.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/moduletag.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/moduletag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/moduletag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/moduletag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/moduletag2.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/moduletag2.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/moduletag2.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/moduletag2.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/moduletag3.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/moduletag3.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/moduletag3.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/moduletag3.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/namedFuncStatement.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/namedFuncStatement.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/namedFuncStatement.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/namedFuncStatement.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/namedFuncStatement2.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/namedFuncStatement2.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/namedFuncStatement2.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/namedFuncStatement2.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/namedFuncStatement3.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/namedFuncStatement3.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/namedFuncStatement3.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/namedFuncStatement3.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/namespacetag.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/namespacetag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/namespacetag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/namespacetag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/objectlit.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/objectlit.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/objectlit.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/objectlit.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/objectlit2.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/objectlit2.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/objectlit2.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/objectlit2.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/objectpropertykeys.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/objectpropertykeys.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/objectpropertykeys.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/objectpropertykeys.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/paramtag.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/paramtag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/paramtag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/paramtag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/paramtaginvalidtype.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/paramtaginvalidtype.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/paramtaginvalidtype.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/paramtaginvalidtype.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/plugins.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/plugins.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/plugins.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/plugins.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/privatetag.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/privatetag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/privatetag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/privatetag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/projecttag.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/projecttag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/projecttag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/projecttag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/propertytag.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/propertytag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/propertytag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/propertytag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/quotename.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/quotename.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/quotename.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/quotename.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/quotename2.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/quotename2.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/quotename2.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/quotename2.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/readonlytag.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/readonlytag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/readonlytag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/readonlytag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/requirestag.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/requirestag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/requirestag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/requirestag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/returnstag.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/returnstag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/returnstag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/returnstag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/scopetags.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/scopetags.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/scopetags.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/scopetags.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/seetag.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/seetag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/seetag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/seetag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/sincetag.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/sincetag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/sincetag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/sincetag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/specialnames.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/specialnames.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/specialnames.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/specialnames.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/src/_dir2/four.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/src/_dir2/four.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/src/_dir2/four.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/src/_dir2/four.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/src/_ignored.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/src/_ignored.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/src/_ignored.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/src/_ignored.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/src/dir1/three.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/src/dir1/three.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/src/dir1/three.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/src/dir1/three.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/src/ignored.txt b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/src/ignored.txt
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/src/ignored.txt
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/src/ignored.txt
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/src/one.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/src/one.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/src/one.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/src/one.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/src/two.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/src/two.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/src/two.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/src/two.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/starbangstar.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/starbangstar.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/starbangstar.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/starbangstar.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/summarytag.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/summarytag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/summarytag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/summarytag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/testPlugin1.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/testPlugin1.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/testPlugin1.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/testPlugin1.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/testPlugin2.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/testPlugin2.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/testPlugin2.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/testPlugin2.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/this-and-objectlit.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/this-and-objectlit.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/this-and-objectlit.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/this-and-objectlit.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/this.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/this.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/this.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/this.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/this2.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/this2.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/this2.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/this2.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/this3.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/this3.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/this3.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/this3.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/thistag.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/thistag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/thistag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/thistag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/todotag.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/todotag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/todotag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/todotag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/tutorialtag.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/tutorialtag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/tutorialtag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/tutorialtag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/typedeftag.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/typedeftag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/typedeftag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/typedeftag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/typekind.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/typekind.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/typekind.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/typekind.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/typetag.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/typetag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/typetag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/typetag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/typetagwithnewline.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/typetagwithnewline.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/typetagwithnewline.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/typetagwithnewline.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/undocumentedtag.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/undocumentedtag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/undocumentedtag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/undocumentedtag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/utf8.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/utf8.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/utf8.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/utf8.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/var.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/var.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/var.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/var.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/variations.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/variations.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/variations.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/variations.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/variations2.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/variations2.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/variations2.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/variations2.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/variations3.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/variations3.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/variations3.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/variations3.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/versiontag.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/versiontag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/versiontag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/versiontag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/virtual.js b/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/virtual.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/fixtures/virtual.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/fixtures/virtual.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/jasmine-jsdoc.js b/conf/node_modules/jsdoc/api/jsdoc/test/jasmine-jsdoc.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/jasmine-jsdoc.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/jasmine-jsdoc.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/lib/jasmine.js b/conf/node_modules/jsdoc/api/jsdoc/test/lib/jasmine.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/lib/jasmine.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/lib/jasmine.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/reporter.js b/conf/node_modules/jsdoc/api/jsdoc/test/reporter.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/reporter.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/reporter.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/runner.js b/conf/node_modules/jsdoc/api/jsdoc/test/runner.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/runner.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/runner.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/spec-collection.js b/conf/node_modules/jsdoc/api/jsdoc/test/spec-collection.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/spec-collection.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/spec-collection.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/alias.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/alias.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/alias.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/alias.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/also.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/also.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/also.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/also.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/callback.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/callback.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/callback.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/callback.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/exports.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/exports.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/exports.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/exports.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/getset.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/getset.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/getset.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/getset.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/inlinecomment.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/inlinecomment.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/inlinecomment.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/inlinecomment.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/inner.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/inner.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/inner.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/inner.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/innerscope.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/innerscope.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/innerscope.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/innerscope.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/lends.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/lends.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/lends.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/lends.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/letkeyword.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/letkeyword.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/letkeyword.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/letkeyword.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/moduleinner.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/moduleinner.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/moduleinner.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/moduleinner.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/moduleisconstructor.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/moduleisconstructor.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/moduleisconstructor.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/moduleisconstructor.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/moduleisfunction.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/moduleisfunction.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/moduleisfunction.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/moduleisfunction.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/modules.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/modules.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/modules.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/modules.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/namedFuncStatement.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/namedFuncStatement.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/namedFuncStatement.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/namedFuncStatement.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/objectlit.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/objectlit.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/objectlit.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/objectlit.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/objectpropertykeys.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/objectpropertykeys.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/objectpropertykeys.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/objectpropertykeys.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/quotename.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/quotename.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/quotename.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/quotename.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/specialnames.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/specialnames.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/specialnames.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/specialnames.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/starbangstar.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/starbangstar.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/starbangstar.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/starbangstar.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/this.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/this.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/this.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/this.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/typetagwithnewline.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/typetagwithnewline.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/typetagwithnewline.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/typetagwithnewline.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/var.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/var.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/var.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/var.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/variations.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/variations.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/variations.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/variations.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/virtual.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/virtual.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/virtual.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/documentation/virtual.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/augment.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/augment.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/augment.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/augment.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/borrow.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/borrow.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/borrow.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/borrow.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/config.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/config.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/config.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/config.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/doclet.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/doclet.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/doclet.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/doclet.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/name.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/name.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/name.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/name.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/opts/argparser.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/opts/argparser.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/opts/argparser.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/opts/argparser.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/opts/args.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/opts/args.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/opts/args.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/opts/args.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/path.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/path.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/path.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/path.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/plugins.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/plugins.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/plugins.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/plugins.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/readme.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/readme.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/readme.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/readme.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/src/filter.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/src/filter.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/src/filter.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/src/filter.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/src/handlers.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/src/handlers.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/src/handlers.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/src/handlers.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/src/parser.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/src/parser.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/src/parser.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/src/parser.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/src/scanner.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/src/scanner.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/src/scanner.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/src/scanner.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/tag.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/tag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/tag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/tag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/tag/dictionary.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/tag/dictionary.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/tag/dictionary.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/tag/dictionary.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/tag/dictionary/definitions.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/tag/dictionary/definitions.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/tag/dictionary/definitions.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/tag/dictionary/definitions.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/tag/inline.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/tag/inline.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/tag/inline.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/tag/inline.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/tag/type.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/tag/type.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/tag/type.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/tag/type.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/tag/validator.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/tag/validator.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/tag/validator.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/tag/validator.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/tutorial.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/tutorial.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/tutorial.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/tutorial.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/tutorial/resolver.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/tutorial/resolver.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/tutorial/resolver.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/tutorial/resolver.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/util/doop.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/util/doop.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/util/doop.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/util/doop.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/util/dumper.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/util/dumper.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/util/dumper.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/util/dumper.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/util/error.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/util/error.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/util/error.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/util/error.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/util/include.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/util/include.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/util/include.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/util/include.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/util/markdown.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/util/markdown.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/util/markdown.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/util/markdown.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/util/templateHelper.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/util/templateHelper.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/util/templateHelper.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/util/templateHelper.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/util/vm.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/util/vm.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/util/vm.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/jsdoc/util/vm.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/jshint/jshint-clean.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/jshint/jshint-clean.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/jshint/jshint-clean.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/jshint/jshint-clean.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/plugins/plugins.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/plugins/plugins.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/plugins/plugins.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/plugins/plugins.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/rhino/fs.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/rhino/fs.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/rhino/fs.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/rhino/fs.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/rhino/os.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/rhino/os.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/rhino/os.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/rhino/os.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/rhino/path.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/rhino/path.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/rhino/path.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/rhino/path.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/abstracttag.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/abstracttag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/abstracttag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/abstracttag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/accesstag.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/accesstag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/accesstag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/accesstag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/aliastag.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/aliastag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/aliastag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/aliastag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/augmentstag.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/augmentstag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/augmentstag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/augmentstag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/authortag.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/authortag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/authortag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/authortag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/borrowstag.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/borrowstag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/borrowstag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/borrowstag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/classdesctag.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/classdesctag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/classdesctag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/classdesctag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/classtag.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/classtag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/classtag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/classtag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/constanttag.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/constanttag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/constanttag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/constanttag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/constructortag.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/constructortag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/constructortag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/constructortag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/constructstag.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/constructstag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/constructstag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/constructstag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/copyrighttag.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/copyrighttag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/copyrighttag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/copyrighttag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/defaulttag.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/defaulttag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/defaulttag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/defaulttag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/deprecatedtag.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/deprecatedtag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/deprecatedtag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/deprecatedtag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/descriptiontag.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/descriptiontag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/descriptiontag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/descriptiontag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/enumtag.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/enumtag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/enumtag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/enumtag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/eventfirestag.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/eventfirestag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/eventfirestag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/eventfirestag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/exampletag.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/exampletag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/exampletag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/exampletag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/exceptiontag.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/exceptiontag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/exceptiontag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/exceptiontag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/exportstag.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/exportstag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/exportstag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/exportstag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/functiontag.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/functiontag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/functiontag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/functiontag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/globaltag.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/globaltag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/globaltag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/globaltag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/ignoretag.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/ignoretag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/ignoretag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/ignoretag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/kindtag.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/kindtag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/kindtag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/kindtag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/lendstag.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/lendstag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/lendstag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/lendstag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/licensetag.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/licensetag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/licensetag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/licensetag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/listenstag.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/listenstag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/listenstag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/listenstag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/memberoftag.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/memberoftag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/memberoftag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/memberoftag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/membertag.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/membertag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/membertag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/membertag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/mixestag.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/mixestag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/mixestag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/mixestag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/mixintag.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/mixintag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/mixintag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/mixintag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/moduletag.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/moduletag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/moduletag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/moduletag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/namespacetag.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/namespacetag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/namespacetag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/namespacetag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/overviewtag.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/overviewtag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/overviewtag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/overviewtag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/paramtag.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/paramtag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/paramtag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/paramtag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/privatetag.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/privatetag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/privatetag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/privatetag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/propertytag.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/propertytag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/propertytag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/propertytag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/readonlytag.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/readonlytag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/readonlytag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/readonlytag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/requirestag.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/requirestag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/requirestag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/requirestag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/returnstag.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/returnstag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/returnstag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/returnstag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/scopetags.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/scopetags.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/scopetags.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/scopetags.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/seetag.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/seetag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/seetag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/seetag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/sincetag.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/sincetag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/sincetag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/sincetag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/summarytag.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/summarytag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/summarytag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/summarytag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/thistag.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/thistag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/thistag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/thistag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/todotag.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/todotag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/todotag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/todotag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/tutorialtag.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/tutorialtag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/tutorialtag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/tutorialtag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/typedeftag.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/typedeftag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/typedeftag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/typedeftag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/typekind.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/typekind.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/typekind.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/typekind.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/typetag.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/typetag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/typetag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/typetag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/undocumentedtag.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/undocumentedtag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/undocumentedtag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/undocumentedtag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/versiontag.js b/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/versiontag.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/versiontag.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/specs/tags/versiontag.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/tutorials/build.sh b/conf/node_modules/jsdoc/api/jsdoc/test/tutorials/build.sh
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/tutorials/build.sh
rename to conf/node_modules/jsdoc/api/jsdoc/test/tutorials/build.sh
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/tutorials/duplicateDefined/asdf.html b/conf/node_modules/jsdoc/api/jsdoc/test/tutorials/duplicateDefined/asdf.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/tutorials/duplicateDefined/asdf.html
rename to conf/node_modules/jsdoc/api/jsdoc/test/tutorials/duplicateDefined/asdf.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/tutorials/duplicateDefined/asdf.json b/conf/node_modules/jsdoc/api/jsdoc/test/tutorials/duplicateDefined/asdf.json
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/tutorials/duplicateDefined/asdf.json
rename to conf/node_modules/jsdoc/api/jsdoc/test/tutorials/duplicateDefined/asdf.json
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/tutorials/duplicateDefined/index.json b/conf/node_modules/jsdoc/api/jsdoc/test/tutorials/duplicateDefined/index.json
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/tutorials/duplicateDefined/index.json
rename to conf/node_modules/jsdoc/api/jsdoc/test/tutorials/duplicateDefined/index.json
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/tutorials/incomplete/parent.html b/conf/node_modules/jsdoc/api/jsdoc/test/tutorials/incomplete/parent.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/tutorials/incomplete/parent.html
rename to conf/node_modules/jsdoc/api/jsdoc/test/tutorials/incomplete/parent.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/tutorials/incomplete/parent.json b/conf/node_modules/jsdoc/api/jsdoc/test/tutorials/incomplete/parent.json
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/tutorials/incomplete/parent.json
rename to conf/node_modules/jsdoc/api/jsdoc/test/tutorials/incomplete/parent.json
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/tutorials/src/x.js b/conf/node_modules/jsdoc/api/jsdoc/test/tutorials/src/x.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/tutorials/src/x.js
rename to conf/node_modules/jsdoc/api/jsdoc/test/tutorials/src/x.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/tutorials/tutorials/constructor.md b/conf/node_modules/jsdoc/api/jsdoc/test/tutorials/tutorials/constructor.md
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/tutorials/tutorials/constructor.md
rename to conf/node_modules/jsdoc/api/jsdoc/test/tutorials/tutorials/constructor.md
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/tutorials/tutorials/multiple.json b/conf/node_modules/jsdoc/api/jsdoc/test/tutorials/tutorials/multiple.json
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/tutorials/tutorials/multiple.json
rename to conf/node_modules/jsdoc/api/jsdoc/test/tutorials/tutorials/multiple.json
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/tutorials/tutorials/test.html b/conf/node_modules/jsdoc/api/jsdoc/test/tutorials/tutorials/test.html
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/tutorials/tutorials/test.html
rename to conf/node_modules/jsdoc/api/jsdoc/test/tutorials/tutorials/test.html
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/tutorials/tutorials/test.json b/conf/node_modules/jsdoc/api/jsdoc/test/tutorials/tutorials/test.json
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/tutorials/tutorials/test.json
rename to conf/node_modules/jsdoc/api/jsdoc/test/tutorials/tutorials/test.json
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/tutorials/tutorials/test2.markdown b/conf/node_modules/jsdoc/api/jsdoc/test/tutorials/tutorials/test2.markdown
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/tutorials/tutorials/test2.markdown
rename to conf/node_modules/jsdoc/api/jsdoc/test/tutorials/tutorials/test2.markdown
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/tutorials/tutorials/test3.htm b/conf/node_modules/jsdoc/api/jsdoc/test/tutorials/tutorials/test3.htm
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/tutorials/tutorials/test3.htm
rename to conf/node_modules/jsdoc/api/jsdoc/test/tutorials/tutorials/test3.htm
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/tutorials/tutorials/test4.md b/conf/node_modules/jsdoc/api/jsdoc/test/tutorials/tutorials/test4.md
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/tutorials/tutorials/test4.md
rename to conf/node_modules/jsdoc/api/jsdoc/test/tutorials/tutorials/test4.md
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/tutorials/tutorials/test5.txt b/conf/node_modules/jsdoc/api/jsdoc/test/tutorials/tutorials/test5.txt
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/tutorials/tutorials/test5.txt
rename to conf/node_modules/jsdoc/api/jsdoc/test/tutorials/tutorials/test5.txt
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/tutorials/tutorials/test6.xml b/conf/node_modules/jsdoc/api/jsdoc/test/tutorials/tutorials/test6.xml
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/jsdoc/test/tutorials/tutorials/test6.xml
rename to conf/node_modules/jsdoc/api/jsdoc/test/tutorials/tutorials/test6.xml
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/plugins/api.js b/conf/node_modules/jsdoc/api/plugins/api.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/plugins/api.js
rename to conf/node_modules/jsdoc/api/plugins/api.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/plugins/events.js b/conf/node_modules/jsdoc/api/plugins/events.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/plugins/events.js
rename to conf/node_modules/jsdoc/api/plugins/events.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/plugins/inheritdoc.js b/conf/node_modules/jsdoc/api/plugins/inheritdoc.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/plugins/inheritdoc.js
rename to conf/node_modules/jsdoc/api/plugins/inheritdoc.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/plugins/interface.js b/conf/node_modules/jsdoc/api/plugins/interface.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/plugins/interface.js
rename to conf/node_modules/jsdoc/api/plugins/interface.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/plugins/observable.js b/conf/node_modules/jsdoc/api/plugins/observable.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/plugins/observable.js
rename to conf/node_modules/jsdoc/api/plugins/observable.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/plugins/typedefs.js b/conf/node_modules/jsdoc/api/plugins/typedefs.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/plugins/typedefs.js
rename to conf/node_modules/jsdoc/api/plugins/typedefs.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/template/README.md b/conf/node_modules/jsdoc/api/template/README.md
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/template/README.md
rename to conf/node_modules/jsdoc/api/template/README.md
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/template/less/common.less b/conf/node_modules/jsdoc/api/template/less/common.less
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/template/less/common.less
rename to conf/node_modules/jsdoc/api/template/less/common.less
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/template/less/footer.less b/conf/node_modules/jsdoc/api/template/less/footer.less
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/template/less/footer.less
rename to conf/node_modules/jsdoc/api/template/less/footer.less
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/template/less/jaguar.less b/conf/node_modules/jsdoc/api/template/less/jaguar.less
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/template/less/jaguar.less
rename to conf/node_modules/jsdoc/api/template/less/jaguar.less
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/template/less/main.less b/conf/node_modules/jsdoc/api/template/less/main.less
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/template/less/main.less
rename to conf/node_modules/jsdoc/api/template/less/main.less
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/template/less/navigation.less b/conf/node_modules/jsdoc/api/template/less/navigation.less
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/template/less/navigation.less
rename to conf/node_modules/jsdoc/api/template/less/navigation.less
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/template/publish.js b/conf/node_modules/jsdoc/api/template/publish.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/template/publish.js
rename to conf/node_modules/jsdoc/api/template/publish.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/template/static/fonts/glyphicons-halflings-regular.eot b/conf/node_modules/jsdoc/api/template/static/fonts/glyphicons-halflings-regular.eot
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/template/static/fonts/glyphicons-halflings-regular.eot
rename to conf/node_modules/jsdoc/api/template/static/fonts/glyphicons-halflings-regular.eot
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/template/static/fonts/glyphicons-halflings-regular.svg b/conf/node_modules/jsdoc/api/template/static/fonts/glyphicons-halflings-regular.svg
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/template/static/fonts/glyphicons-halflings-regular.svg
rename to conf/node_modules/jsdoc/api/template/static/fonts/glyphicons-halflings-regular.svg
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/template/static/fonts/glyphicons-halflings-regular.ttf b/conf/node_modules/jsdoc/api/template/static/fonts/glyphicons-halflings-regular.ttf
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/template/static/fonts/glyphicons-halflings-regular.ttf
rename to conf/node_modules/jsdoc/api/template/static/fonts/glyphicons-halflings-regular.ttf
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/template/static/fonts/glyphicons-halflings-regular.woff b/conf/node_modules/jsdoc/api/template/static/fonts/glyphicons-halflings-regular.woff
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/template/static/fonts/glyphicons-halflings-regular.woff
rename to conf/node_modules/jsdoc/api/template/static/fonts/glyphicons-halflings-regular.woff
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/template/static/logo-70x70.png b/conf/node_modules/jsdoc/api/template/static/logo-70x70.png
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/template/static/logo-70x70.png
rename to conf/node_modules/jsdoc/api/template/static/logo-70x70.png
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/template/static/scripts/bootstrap.min.js b/conf/node_modules/jsdoc/api/template/static/scripts/bootstrap.min.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/template/static/scripts/bootstrap.min.js
rename to conf/node_modules/jsdoc/api/template/static/scripts/bootstrap.min.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/template/static/scripts/jquery.min.js b/conf/node_modules/jsdoc/api/template/static/scripts/jquery.min.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/template/static/scripts/jquery.min.js
rename to conf/node_modules/jsdoc/api/template/static/scripts/jquery.min.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/template/static/scripts/jquery.min.map b/conf/node_modules/jsdoc/api/template/static/scripts/jquery.min.map
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/template/static/scripts/jquery.min.map
rename to conf/node_modules/jsdoc/api/template/static/scripts/jquery.min.map
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/template/static/scripts/linenumber.js b/conf/node_modules/jsdoc/api/template/static/scripts/linenumber.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/template/static/scripts/linenumber.js
rename to conf/node_modules/jsdoc/api/template/static/scripts/linenumber.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/template/static/scripts/main.js b/conf/node_modules/jsdoc/api/template/static/scripts/main.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/template/static/scripts/main.js
rename to conf/node_modules/jsdoc/api/template/static/scripts/main.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/template/static/scripts/prettify/Apache-License-2.0.txt b/conf/node_modules/jsdoc/api/template/static/scripts/prettify/Apache-License-2.0.txt
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/template/static/scripts/prettify/Apache-License-2.0.txt
rename to conf/node_modules/jsdoc/api/template/static/scripts/prettify/Apache-License-2.0.txt
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/template/static/scripts/prettify/lang-css.js b/conf/node_modules/jsdoc/api/template/static/scripts/prettify/lang-css.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/template/static/scripts/prettify/lang-css.js
rename to conf/node_modules/jsdoc/api/template/static/scripts/prettify/lang-css.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/template/static/scripts/prettify/prettify.js b/conf/node_modules/jsdoc/api/template/static/scripts/prettify/prettify.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/template/static/scripts/prettify/prettify.js
rename to conf/node_modules/jsdoc/api/template/static/scripts/prettify/prettify.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/template/static/scripts/underscore-min.js b/conf/node_modules/jsdoc/api/template/static/scripts/underscore-min.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/template/static/scripts/underscore-min.js
rename to conf/node_modules/jsdoc/api/template/static/scripts/underscore-min.js
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/template/static/scripts/underscore-min.map b/conf/node_modules/jsdoc/api/template/static/scripts/underscore-min.map
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/template/static/scripts/underscore-min.map
rename to conf/node_modules/jsdoc/api/template/static/scripts/underscore-min.map
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/template/static/styles/bootstrap.min.css b/conf/node_modules/jsdoc/api/template/static/styles/bootstrap.min.css
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/template/static/styles/bootstrap.min.css
rename to conf/node_modules/jsdoc/api/template/static/styles/bootstrap.min.css
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/template/static/styles/jaguar.css b/conf/node_modules/jsdoc/api/template/static/styles/jaguar.css
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/template/static/styles/jaguar.css
rename to conf/node_modules/jsdoc/api/template/static/styles/jaguar.css
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/template/static/styles/prettify-jsdoc.css b/conf/node_modules/jsdoc/api/template/static/styles/prettify-jsdoc.css
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/template/static/styles/prettify-jsdoc.css
rename to conf/node_modules/jsdoc/api/template/static/styles/prettify-jsdoc.css
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/template/static/styles/prettify-tomorrow.css b/conf/node_modules/jsdoc/api/template/static/styles/prettify-tomorrow.css
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/template/static/styles/prettify-tomorrow.css
rename to conf/node_modules/jsdoc/api/template/static/styles/prettify-tomorrow.css
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/template/tmpl/container.tmpl b/conf/node_modules/jsdoc/api/template/tmpl/container.tmpl
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/template/tmpl/container.tmpl
rename to conf/node_modules/jsdoc/api/template/tmpl/container.tmpl
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/template/tmpl/details.tmpl b/conf/node_modules/jsdoc/api/template/tmpl/details.tmpl
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/template/tmpl/details.tmpl
rename to conf/node_modules/jsdoc/api/template/tmpl/details.tmpl
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/template/tmpl/example.tmpl b/conf/node_modules/jsdoc/api/template/tmpl/example.tmpl
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/template/tmpl/example.tmpl
rename to conf/node_modules/jsdoc/api/template/tmpl/example.tmpl
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/template/tmpl/examples.tmpl b/conf/node_modules/jsdoc/api/template/tmpl/examples.tmpl
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/template/tmpl/examples.tmpl
rename to conf/node_modules/jsdoc/api/template/tmpl/examples.tmpl
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/template/tmpl/exceptions.tmpl b/conf/node_modules/jsdoc/api/template/tmpl/exceptions.tmpl
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/template/tmpl/exceptions.tmpl
rename to conf/node_modules/jsdoc/api/template/tmpl/exceptions.tmpl
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/template/tmpl/layout.tmpl b/conf/node_modules/jsdoc/api/template/tmpl/layout.tmpl
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/template/tmpl/layout.tmpl
rename to conf/node_modules/jsdoc/api/template/tmpl/layout.tmpl
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/template/tmpl/mainpage.tmpl b/conf/node_modules/jsdoc/api/template/tmpl/mainpage.tmpl
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/template/tmpl/mainpage.tmpl
rename to conf/node_modules/jsdoc/api/template/tmpl/mainpage.tmpl
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/template/tmpl/members.tmpl b/conf/node_modules/jsdoc/api/template/tmpl/members.tmpl
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/template/tmpl/members.tmpl
rename to conf/node_modules/jsdoc/api/template/tmpl/members.tmpl
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/template/tmpl/method.tmpl b/conf/node_modules/jsdoc/api/template/tmpl/method.tmpl
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/template/tmpl/method.tmpl
rename to conf/node_modules/jsdoc/api/template/tmpl/method.tmpl
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/template/tmpl/navigation.tmpl b/conf/node_modules/jsdoc/api/template/tmpl/navigation.tmpl
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/template/tmpl/navigation.tmpl
rename to conf/node_modules/jsdoc/api/template/tmpl/navigation.tmpl
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/template/tmpl/observables.tmpl b/conf/node_modules/jsdoc/api/template/tmpl/observables.tmpl
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/template/tmpl/observables.tmpl
rename to conf/node_modules/jsdoc/api/template/tmpl/observables.tmpl
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/template/tmpl/params.tmpl b/conf/node_modules/jsdoc/api/template/tmpl/params.tmpl
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/template/tmpl/params.tmpl
rename to conf/node_modules/jsdoc/api/template/tmpl/params.tmpl
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/template/tmpl/properties.tmpl b/conf/node_modules/jsdoc/api/template/tmpl/properties.tmpl
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/template/tmpl/properties.tmpl
rename to conf/node_modules/jsdoc/api/template/tmpl/properties.tmpl
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/template/tmpl/returns.tmpl b/conf/node_modules/jsdoc/api/template/tmpl/returns.tmpl
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/template/tmpl/returns.tmpl
rename to conf/node_modules/jsdoc/api/template/tmpl/returns.tmpl
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/template/tmpl/source.tmpl b/conf/node_modules/jsdoc/api/template/tmpl/source.tmpl
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/template/tmpl/source.tmpl
rename to conf/node_modules/jsdoc/api/template/tmpl/source.tmpl
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/template/tmpl/stability.tmpl b/conf/node_modules/jsdoc/api/template/tmpl/stability.tmpl
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/template/tmpl/stability.tmpl
rename to conf/node_modules/jsdoc/api/template/tmpl/stability.tmpl
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/template/tmpl/tutorial.tmpl b/conf/node_modules/jsdoc/api/template/tmpl/tutorial.tmpl
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/template/tmpl/tutorial.tmpl
rename to conf/node_modules/jsdoc/api/template/tmpl/tutorial.tmpl
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/api/template/tmpl/type.tmpl b/conf/node_modules/jsdoc/api/template/tmpl/type.tmpl
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/api/template/tmpl/type.tmpl
rename to conf/node_modules/jsdoc/api/template/tmpl/type.tmpl
diff --git a/vmap/client/conf/conf/node_modules/jsdoc/package.json b/conf/node_modules/jsdoc/package.json
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/node_modules/jsdoc/package.json
rename to conf/node_modules/jsdoc/package.json
diff --git a/vmap/client/conf/conf/package.json b/conf/package.json
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/package.json
rename to conf/package.json
diff --git a/vmap/client/conf/conf/properties.json b/conf/properties.json
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/properties.json
rename to conf/properties.json
diff --git a/vmap/client/conf/conf/requires/config.js b/conf/requires/config.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/requires/config.js
rename to conf/requires/config.js
diff --git a/vmap/client/conf/conf/requires/requiresApp.js b/conf/requires/requiresApp.js
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/requires/requiresApp.js
rename to conf/requires/requiresApp.js
diff --git a/vmap/client/conf/conf/runjsdoc.cmd b/conf/runjsdoc.cmd
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/client/conf/conf/runjsdoc.cmd
rename to conf/runjsdoc.cmd
diff --git a/init_vmap.sh b/init_vmap.sh
deleted file mode 100755
index 8916413b570eaef6de386671e940f19a0248974c..0000000000000000000000000000000000000000
--- a/init_vmap.sh
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/bash
-#
-#
-# 	Script d'initialisation d'un dépot vMap versionné sous git
-#
-#   Split repo
-#   git subtree split -P module/ -b module_split_branch
-#
-#   Add subtree
-#   git subtree add --prefix vmap "git@vm09.veremes.net:Development/vitis_apps/sources/Vitis.git" master
-#
-#
-
-
-APP_NAME="vmap"
-APP_MODULES=( vmap vm4ms anc cadastre cadastreV2 )
-
-rm -Rf repos
-
-# Vitis
-echo "---- INIT Vitis ----"
-git subtree add --prefix ${APP_NAME} "git@vm09.veremes.net:Development/vitis_apps/sources/Vitis.git" master
-
-# Conf
-echo "---- INIT $APP_NAME conf ----"
-git subtree add --prefix ${APP_NAME}/client/conf "git@vm09.veremes.net:Development/vitis_apps/sources/app_${APP_NAME}.git" master
-
-# Modules
-for module in "${APP_MODULES[@]}"; do
-	echo "---- INIT ${module} ----"
-
-    # Ajoute le dépôt
-    git clone "git@vm09.veremes.net:Development/vitis_apps/sources/module_${module}.git" repos/module_${module}
-    if [ -d "$(pwd)/repos/module_${module}/" ]; then
-
-        # Crée les branches contenant uniquement les dossiers cibles
-        cd repos/module_${module}/
-        if [ -d "$(pwd)/module/" ]; then
-            git subtree split -P module/ -b module_split
-        fi
-        if [ -d "$(pwd)/web_service/conf/" ]; then
-            git subtree split -P web_service/conf/ -b web_service_conf_split
-        fi
-        if [ -d "$(pwd)/web_service/sql/" ]; then
-            git subtree split -P web_service/sql/ -b web_service_sql_split
-        fi
-        if [ -d "$(pwd)/web_service/ws/" ]; then
-            git subtree split -P web_service/ws/ -b web_service_ws_split
-        fi
-        cd ../../
-
-        # Ajoute les subtrees
-        if [ -d "$(pwd)/repos/module_${module}/module/" ]; then
-            git subtree add --prefix ${APP_NAME}/client/modules/${module} repos/module_${module}/.git module_split
-        fi
-        if [ -d "$(pwd)/repos/module_${module}/web_service/conf/" ]; then
-            git subtree add --prefix ${APP_NAME}/vas/rest/conf/${module} repos/module_${module}/.git web_service_conf_split
-        fi
-        if [ -d "$(pwd)/repos/module_${module}/web_service/ws/" ]; then
-            git subtree add --prefix ${APP_NAME}/vas/rest/ws/${module} repos/module_${module}/.git web_service_ws_split
-        fi
-        if [ -d "$(pwd)/repos/module_${module}/web_service/sql/" ]; then
-            git subtree add --prefix ${APP_NAME}/vas/sql/${module} repos/module_${module}/.git web_service_sql_split
-        fi
-    fi
-done
diff --git a/src/module_anc/README.md b/src/module_anc/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..ec477e7f10112dd1823f0916fc8f8bab791acda7
--- /dev/null
+++ b/src/module_anc/README.md
@@ -0,0 +1 @@
+Module ANC for Vitis
\ No newline at end of file
diff --git a/vmap/client/modules/anc/_install/dependency.xml b/src/module_anc/module/_install/dependency.xml
similarity index 100%
rename from vmap/client/modules/anc/_install/dependency.xml
rename to src/module_anc/module/_install/dependency.xml
diff --git a/vmap/client/modules/anc/forms/anc_parametrage/anc_parametrage_anc_entreprise.json b/src/module_anc/module/forms/anc_parametrage/anc_parametrage_anc_entreprise.json
similarity index 100%
rename from vmap/client/modules/anc/forms/anc_parametrage/anc_parametrage_anc_entreprise.json
rename to src/module_anc/module/forms/anc_parametrage/anc_parametrage_anc_entreprise.json
diff --git a/vmap/client/modules/anc/forms/anc_parametrage/anc_parametrage_anc_param_admin.json b/src/module_anc/module/forms/anc_parametrage/anc_parametrage_anc_param_admin.json
similarity index 100%
rename from vmap/client/modules/anc/forms/anc_parametrage/anc_parametrage_anc_param_admin.json
rename to src/module_anc/module/forms/anc_parametrage/anc_parametrage_anc_param_admin.json
diff --git a/vmap/client/modules/anc/forms/anc_parametrage/anc_parametrage_anc_param_liste.json b/src/module_anc/module/forms/anc_parametrage/anc_parametrage_anc_param_liste.json
similarity index 100%
rename from vmap/client/modules/anc/forms/anc_parametrage/anc_parametrage_anc_param_liste.json
rename to src/module_anc/module/forms/anc_parametrage/anc_parametrage_anc_param_liste.json
diff --git a/vmap/client/modules/anc/forms/anc_parametrage/anc_parametrage_anc_param_tarif.json b/src/module_anc/module/forms/anc_parametrage/anc_parametrage_anc_param_tarif.json
similarity index 100%
rename from vmap/client/modules/anc/forms/anc_parametrage/anc_parametrage_anc_param_tarif.json
rename to src/module_anc/module/forms/anc_parametrage/anc_parametrage_anc_param_tarif.json
diff --git a/vmap/client/modules/anc/forms/anc_saisie/anc_saisie_anc_controle.json b/src/module_anc/module/forms/anc_saisie/anc_saisie_anc_controle.json
similarity index 100%
rename from vmap/client/modules/anc/forms/anc_saisie/anc_saisie_anc_controle.json
rename to src/module_anc/module/forms/anc_saisie/anc_saisie_anc_controle.json
diff --git a/vmap/client/modules/anc/forms/anc_saisie/anc_saisie_anc_controle_controle_conclusion.json b/src/module_anc/module/forms/anc_saisie/anc_saisie_anc_controle_controle_conclusion.json
similarity index 100%
rename from vmap/client/modules/anc/forms/anc_saisie/anc_saisie_anc_controle_controle_conclusion.json
rename to src/module_anc/module/forms/anc_saisie/anc_saisie_anc_controle_controle_conclusion.json
diff --git a/vmap/client/modules/anc/forms/anc_saisie/anc_saisie_anc_controle_controle_dispositif.json b/src/module_anc/module/forms/anc_saisie/anc_saisie_anc_controle_controle_dispositif.json
similarity index 100%
rename from vmap/client/modules/anc/forms/anc_saisie/anc_saisie_anc_controle_controle_dispositif.json
rename to src/module_anc/module/forms/anc_saisie/anc_saisie_anc_controle_controle_dispositif.json
diff --git a/vmap/client/modules/anc/forms/anc_saisie/anc_saisie_anc_controle_controle_documents.json b/src/module_anc/module/forms/anc_saisie/anc_saisie_anc_controle_controle_documents.json
similarity index 100%
rename from vmap/client/modules/anc/forms/anc_saisie/anc_saisie_anc_controle_controle_documents.json
rename to src/module_anc/module/forms/anc_saisie/anc_saisie_anc_controle_controle_documents.json
diff --git a/vmap/client/modules/anc/forms/anc_saisie/anc_saisie_anc_controle_controle_evacuation.json b/src/module_anc/module/forms/anc_saisie/anc_saisie_anc_controle_controle_evacuation.json
similarity index 100%
rename from vmap/client/modules/anc/forms/anc_saisie/anc_saisie_anc_controle_controle_evacuation.json
rename to src/module_anc/module/forms/anc_saisie/anc_saisie_anc_controle_controle_evacuation.json
diff --git a/vmap/client/modules/anc/forms/anc_saisie/anc_saisie_anc_controle_controle_filieres.json b/src/module_anc/module/forms/anc_saisie/anc_saisie_anc_controle_controle_filieres.json
similarity index 100%
rename from vmap/client/modules/anc/forms/anc_saisie/anc_saisie_anc_controle_controle_filieres.json
rename to src/module_anc/module/forms/anc_saisie/anc_saisie_anc_controle_controle_filieres.json
diff --git a/vmap/client/modules/anc/forms/anc_saisie/anc_saisie_anc_controle_controle_pretraitement.json b/src/module_anc/module/forms/anc_saisie/anc_saisie_anc_controle_controle_pretraitement.json
similarity index 100%
rename from vmap/client/modules/anc/forms/anc_saisie/anc_saisie_anc_controle_controle_pretraitement.json
rename to src/module_anc/module/forms/anc_saisie/anc_saisie_anc_controle_controle_pretraitement.json
diff --git a/vmap/client/modules/anc/forms/anc_saisie/anc_saisie_anc_controle_controle_schema.json b/src/module_anc/module/forms/anc_saisie/anc_saisie_anc_controle_controle_schema.json
similarity index 100%
rename from vmap/client/modules/anc/forms/anc_saisie/anc_saisie_anc_controle_controle_schema.json
rename to src/module_anc/module/forms/anc_saisie/anc_saisie_anc_controle_controle_schema.json
diff --git a/vmap/client/modules/anc/forms/anc_saisie/anc_saisie_anc_controle_controle_suivi.json b/src/module_anc/module/forms/anc_saisie/anc_saisie_anc_controle_controle_suivi.json
similarity index 100%
rename from vmap/client/modules/anc/forms/anc_saisie/anc_saisie_anc_controle_controle_suivi.json
rename to src/module_anc/module/forms/anc_saisie/anc_saisie_anc_controle_controle_suivi.json
diff --git a/vmap/client/modules/anc/forms/anc_saisie/anc_saisie_anc_controle_controle_toilettes_seches.json b/src/module_anc/module/forms/anc_saisie/anc_saisie_anc_controle_controle_toilettes_seches.json
similarity index 100%
rename from vmap/client/modules/anc/forms/anc_saisie/anc_saisie_anc_controle_controle_toilettes_seches.json
rename to src/module_anc/module/forms/anc_saisie/anc_saisie_anc_controle_controle_toilettes_seches.json
diff --git a/vmap/client/modules/anc/forms/anc_saisie/anc_saisie_anc_controle_controle_traitement.json b/src/module_anc/module/forms/anc_saisie/anc_saisie_anc_controle_controle_traitement.json
similarity index 100%
rename from vmap/client/modules/anc/forms/anc_saisie/anc_saisie_anc_controle_controle_traitement.json
rename to src/module_anc/module/forms/anc_saisie/anc_saisie_anc_controle_controle_traitement.json
diff --git a/vmap/client/modules/anc/forms/anc_saisie/anc_saisie_anc_controle_controle_ventilation.json b/src/module_anc/module/forms/anc_saisie/anc_saisie_anc_controle_controle_ventilation.json
similarity index 100%
rename from vmap/client/modules/anc/forms/anc_saisie/anc_saisie_anc_controle_controle_ventilation.json
rename to src/module_anc/module/forms/anc_saisie/anc_saisie_anc_controle_controle_ventilation.json
diff --git a/vmap/client/modules/anc/forms/anc_saisie/anc_saisie_anc_evacuation_eaux.json b/src/module_anc/module/forms/anc_saisie/anc_saisie_anc_evacuation_eaux.json
similarity index 100%
rename from vmap/client/modules/anc/forms/anc_saisie/anc_saisie_anc_evacuation_eaux.json
rename to src/module_anc/module/forms/anc_saisie/anc_saisie_anc_evacuation_eaux.json
diff --git a/vmap/client/modules/anc/forms/anc_saisie/anc_saisie_anc_filieres_agree.json b/src/module_anc/module/forms/anc_saisie/anc_saisie_anc_filieres_agree.json
similarity index 100%
rename from vmap/client/modules/anc/forms/anc_saisie/anc_saisie_anc_filieres_agree.json
rename to src/module_anc/module/forms/anc_saisie/anc_saisie_anc_filieres_agree.json
diff --git a/vmap/client/modules/anc/forms/anc_saisie/anc_saisie_anc_installation.json b/src/module_anc/module/forms/anc_saisie/anc_saisie_anc_installation.json
similarity index 100%
rename from vmap/client/modules/anc/forms/anc_saisie/anc_saisie_anc_installation.json
rename to src/module_anc/module/forms/anc_saisie/anc_saisie_anc_installation.json
diff --git a/vmap/client/modules/anc/forms/anc_saisie/anc_saisie_anc_installation_installation_documents.json b/src/module_anc/module/forms/anc_saisie/anc_saisie_anc_installation_installation_documents.json
similarity index 100%
rename from vmap/client/modules/anc/forms/anc_saisie/anc_saisie_anc_installation_installation_documents.json
rename to src/module_anc/module/forms/anc_saisie/anc_saisie_anc_installation_installation_documents.json
diff --git a/vmap/client/modules/anc/forms/anc_saisie/anc_saisie_anc_installation_installation_suivi.json b/src/module_anc/module/forms/anc_saisie/anc_saisie_anc_installation_installation_suivi.json
similarity index 100%
rename from vmap/client/modules/anc/forms/anc_saisie/anc_saisie_anc_installation_installation_suivi.json
rename to src/module_anc/module/forms/anc_saisie/anc_saisie_anc_installation_installation_suivi.json
diff --git a/vmap/client/modules/anc/forms/anc_saisie/anc_saisie_anc_pretraitement.json b/src/module_anc/module/forms/anc_saisie/anc_saisie_anc_pretraitement.json
similarity index 100%
rename from vmap/client/modules/anc/forms/anc_saisie/anc_saisie_anc_pretraitement.json
rename to src/module_anc/module/forms/anc_saisie/anc_saisie_anc_pretraitement.json
diff --git a/vmap/client/modules/anc/forms/anc_saisie/anc_saisie_anc_traitement.json b/src/module_anc/module/forms/anc_saisie/anc_saisie_anc_traitement.json
similarity index 100%
rename from vmap/client/modules/anc/forms/anc_saisie/anc_saisie_anc_traitement.json
rename to src/module_anc/module/forms/anc_saisie/anc_saisie_anc_traitement.json
diff --git a/vmap/client/modules/anc/javascript/script_module.js b/src/module_anc/module/javascript/script_module.js
similarity index 100%
rename from vmap/client/modules/anc/javascript/script_module.js
rename to src/module_anc/module/javascript/script_module.js
diff --git a/vmap/client/modules/anc/lang/lang-en.json b/src/module_anc/module/lang/lang-en.json
similarity index 100%
rename from vmap/client/modules/anc/lang/lang-en.json
rename to src/module_anc/module/lang/lang-en.json
diff --git a/vmap/client/modules/anc/lang/lang-fr.json b/src/module_anc/module/lang/lang-fr.json
similarity index 100%
rename from vmap/client/modules/anc/lang/lang-fr.json
rename to src/module_anc/module/lang/lang-fr.json
diff --git a/src/module_anc/web_service/_install/dependency.xml b/src/module_anc/web_service/_install/dependency.xml
new file mode 100755
index 0000000000000000000000000000000000000000..b9dc841e62e5caa54a3b6cfeed35024b4aa074d1
--- /dev/null
+++ b/src/module_anc/web_service/_install/dependency.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- WS ANC -->
+<installer>
+	<schema>
+		<name>s_anc</name>
+		<version>2018.02.00</version>
+		<dependenciesCollection>
+			<dependency>
+				<nature>schema</nature>
+				<name>s_vitis</name>
+				<version>2018.03.00</version>
+				<object>vas</object>
+			</dependency>
+			<dependency>
+				<name>postgis</name>
+				<version>2.0</version>
+				<nature>extern-pre</nature>
+			</dependency>
+		</dependenciesCollection>
+	</schema>
+	<dependenciesCollection>
+		<dependency>
+			<nature>vas</nature>
+			<version>2018.03.00</version>
+		</dependency>
+	</dependenciesCollection>
+</installer>
diff --git a/vmap/vas/rest/conf/anc/properties.inc b/src/module_anc/web_service/conf/properties.inc
similarity index 100%
rename from vmap/vas/rest/conf/anc/properties.inc
rename to src/module_anc/web_service/conf/properties.inc
diff --git a/vmap/vas/rest/conf/anc/selected_properties.inc b/src/module_anc/web_service/conf/selected_properties.inc
similarity index 100%
rename from vmap/vas/rest/conf/anc/selected_properties.inc
rename to src/module_anc/web_service/conf/selected_properties.inc
diff --git a/vmap/vas/rest/conf/anc/version.inc b/src/module_anc/web_service/conf/version.inc
similarity index 100%
rename from vmap/vas/rest/conf/anc/version.inc
rename to src/module_anc/web_service/conf/version.inc
diff --git a/vmap/vas/sql/anc/sqlQueries.xml b/src/module_anc/web_service/sql/sqlQueries.xml
similarity index 100%
rename from vmap/vas/sql/anc/sqlQueries.xml
rename to src/module_anc/web_service/sql/sqlQueries.xml
diff --git a/vmap/vas/rest/ws/anc/Anc.class.inc b/src/module_anc/web_service/ws/Anc.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/anc/Anc.class.inc
rename to src/module_anc/web_service/ws/Anc.class.inc
diff --git a/vmap/vas/rest/ws/anc/Anc.class.sql.inc b/src/module_anc/web_service/ws/Anc.class.sql.inc
similarity index 100%
rename from vmap/vas/rest/ws/anc/Anc.class.sql.inc
rename to src/module_anc/web_service/ws/Anc.class.sql.inc
diff --git a/vmap/vas/rest/ws/anc/Composant.class.inc b/src/module_anc/web_service/ws/Composant.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/anc/Composant.class.inc
rename to src/module_anc/web_service/ws/Composant.class.inc
diff --git a/vmap/vas/rest/ws/anc/ComposantTypeFeatureStyle.class.inc b/src/module_anc/web_service/ws/ComposantTypeFeatureStyle.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/anc/ComposantTypeFeatureStyle.class.inc
rename to src/module_anc/web_service/ws/ComposantTypeFeatureStyle.class.inc
diff --git a/vmap/vas/rest/ws/anc/ComposantTypeFeatureStyles.class.inc b/src/module_anc/web_service/ws/ComposantTypeFeatureStyles.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/anc/ComposantTypeFeatureStyles.class.inc
rename to src/module_anc/web_service/ws/ComposantTypeFeatureStyles.class.inc
diff --git a/vmap/vas/rest/ws/anc/Composants.class.inc b/src/module_anc/web_service/ws/Composants.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/anc/Composants.class.inc
rename to src/module_anc/web_service/ws/Composants.class.inc
diff --git a/vmap/vas/rest/ws/anc/Controle.class.inc b/src/module_anc/web_service/ws/Controle.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/anc/Controle.class.inc
rename to src/module_anc/web_service/ws/Controle.class.inc
diff --git a/vmap/vas/rest/ws/anc/Controles.class.inc b/src/module_anc/web_service/ws/Controles.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/anc/Controles.class.inc
rename to src/module_anc/web_service/ws/Controles.class.inc
diff --git a/vmap/vas/rest/ws/anc/Entreprise.class.inc b/src/module_anc/web_service/ws/Entreprise.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/anc/Entreprise.class.inc
rename to src/module_anc/web_service/ws/Entreprise.class.inc
diff --git a/vmap/vas/rest/ws/anc/Entreprises.class.inc b/src/module_anc/web_service/ws/Entreprises.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/anc/Entreprises.class.inc
rename to src/module_anc/web_service/ws/Entreprises.class.inc
diff --git a/vmap/vas/rest/ws/anc/Evacuation_eaux.class.inc b/src/module_anc/web_service/ws/Evacuation_eaux.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/anc/Evacuation_eaux.class.inc
rename to src/module_anc/web_service/ws/Evacuation_eaux.class.inc
diff --git a/vmap/vas/rest/ws/anc/Evacuation_eauxs.class.inc b/src/module_anc/web_service/ws/Evacuation_eauxs.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/anc/Evacuation_eauxs.class.inc
rename to src/module_anc/web_service/ws/Evacuation_eauxs.class.inc
diff --git a/vmap/vas/rest/ws/anc/Filieres_agree.class.inc b/src/module_anc/web_service/ws/Filieres_agree.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/anc/Filieres_agree.class.inc
rename to src/module_anc/web_service/ws/Filieres_agree.class.inc
diff --git a/vmap/vas/rest/ws/anc/Filieres_agrees.class.inc b/src/module_anc/web_service/ws/Filieres_agrees.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/anc/Filieres_agrees.class.inc
rename to src/module_anc/web_service/ws/Filieres_agrees.class.inc
diff --git a/vmap/vas/rest/ws/anc/Installation.class.inc b/src/module_anc/web_service/ws/Installation.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/anc/Installation.class.inc
rename to src/module_anc/web_service/ws/Installation.class.inc
diff --git a/vmap/vas/rest/ws/anc/Installations.class.inc b/src/module_anc/web_service/ws/Installations.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/anc/Installations.class.inc
rename to src/module_anc/web_service/ws/Installations.class.inc
diff --git a/vmap/vas/rest/ws/anc/Param_admin.class.inc b/src/module_anc/web_service/ws/Param_admin.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/anc/Param_admin.class.inc
rename to src/module_anc/web_service/ws/Param_admin.class.inc
diff --git a/vmap/vas/rest/ws/anc/Param_admins.class.inc b/src/module_anc/web_service/ws/Param_admins.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/anc/Param_admins.class.inc
rename to src/module_anc/web_service/ws/Param_admins.class.inc
diff --git a/vmap/vas/rest/ws/anc/Param_liste.class.inc b/src/module_anc/web_service/ws/Param_liste.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/anc/Param_liste.class.inc
rename to src/module_anc/web_service/ws/Param_liste.class.inc
diff --git a/vmap/vas/rest/ws/anc/Param_listes.class.inc b/src/module_anc/web_service/ws/Param_listes.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/anc/Param_listes.class.inc
rename to src/module_anc/web_service/ws/Param_listes.class.inc
diff --git a/vmap/vas/rest/ws/anc/Param_tarif.class.inc b/src/module_anc/web_service/ws/Param_tarif.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/anc/Param_tarif.class.inc
rename to src/module_anc/web_service/ws/Param_tarif.class.inc
diff --git a/vmap/vas/rest/ws/anc/Param_tarifs.class.inc b/src/module_anc/web_service/ws/Param_tarifs.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/anc/Param_tarifs.class.inc
rename to src/module_anc/web_service/ws/Param_tarifs.class.inc
diff --git a/vmap/vas/rest/ws/anc/Pretraitement.class.inc b/src/module_anc/web_service/ws/Pretraitement.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/anc/Pretraitement.class.inc
rename to src/module_anc/web_service/ws/Pretraitement.class.inc
diff --git a/vmap/vas/rest/ws/anc/Pretraitements.class.inc b/src/module_anc/web_service/ws/Pretraitements.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/anc/Pretraitements.class.inc
rename to src/module_anc/web_service/ws/Pretraitements.class.inc
diff --git a/vmap/vas/rest/ws/anc/Traitement.class.inc b/src/module_anc/web_service/ws/Traitement.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/anc/Traitement.class.inc
rename to src/module_anc/web_service/ws/Traitement.class.inc
diff --git a/vmap/vas/rest/ws/anc/Traitements.class.inc b/src/module_anc/web_service/ws/Traitements.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/anc/Traitements.class.inc
rename to src/module_anc/web_service/ws/Traitements.class.inc
diff --git a/vmap/vas/rest/ws/anc/Versions.class.inc b/src/module_anc/web_service/ws/Versions.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/anc/Versions.class.inc
rename to src/module_anc/web_service/ws/Versions.class.inc
diff --git a/vmap/vas/rest/ws/anc/overview.phtml b/src/module_anc/web_service/ws/overview.phtml
similarity index 100%
rename from vmap/vas/rest/ws/anc/overview.phtml
rename to src/module_anc/web_service/ws/overview.phtml
diff --git a/src/module_cadastre/README.md b/src/module_cadastre/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..c850ab7030a5f47a0429638b55f24efcd9541bfe
--- /dev/null
+++ b/src/module_cadastre/README.md
@@ -0,0 +1 @@
+Web service cadastre
\ No newline at end of file
diff --git a/src/module_cadastre/web_service/CHANGE_LOG.txt b/src/module_cadastre/web_service/CHANGE_LOG.txt
new file mode 100755
index 0000000000000000000000000000000000000000..7210b50e5d4b5a858dac05343dd08505aa5dd972
--- /dev/null
+++ b/src/module_cadastre/web_service/CHANGE_LOG.txt
@@ -0,0 +1,13 @@
+b22731|RELEASE	    |cadastre|	Version 2017.01.01
+b22727|BUG			|cadastre|	Privilèges
+b22647|EVOLUTION	|cadastre|	Tous les constructeurs des classes PHP ont été renommé en __construct
+b22139|RELEASE	    |cadastre|	Version 2017.01.00
+b21184|BUG			|cadastre|	projections cadastre
+b20785|BUG			|cadastre|	Rajout du champs , 'l_dsgrpf as "DSGRPF"'
+b20499|BUG			|cadastre|	Ajout Adresse de la parcelle fiche urbanisme
+b20114|BUG			|cadastre|	Modification des versions.inc pour ajouter la status à UNSTABLE
+b20112|BUG			|cadastre|	Erreur dans le require_once
+b19998|BUG			|cadastre|	Web service cadastre --> Suppression de la dépendance au schéma cadastre
+b19822|BUG			|cadastre|	v_lieu_dit
+b19730|BUG			|cadastre|	Utilisation d'un seul fichier de properties pour les modules cadastre v1 et v2
+
diff --git a/src/module_cadastre/web_service/_install/apache.conf b/src/module_cadastre/web_service/_install/apache.conf
new file mode 100755
index 0000000000000000000000000000000000000000..da7bc6a88eba746b6b0fbb13ce9f8c53f4ada9c5
--- /dev/null
+++ b/src/module_cadastre/web_service/_install/apache.conf
@@ -0,0 +1,4 @@
+
+	<Directory "[VASDIRECTORY]/public/cadastre">
+		Require all denied
+	</Directory>
\ No newline at end of file
diff --git a/src/module_cadastre/web_service/_install/dependency.xml b/src/module_cadastre/web_service/_install/dependency.xml
new file mode 100755
index 0000000000000000000000000000000000000000..5ae3784e5e4d383376eaf75318ac4d970393cafa
--- /dev/null
+++ b/src/module_cadastre/web_service/_install/dependency.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- WS GTF -->
+<installer>
+	<dependenciesCollection>
+		<dependency>
+			<nature>vas</nature>
+			<version>2018.05.00</version>
+		</dependency>
+	</dependenciesCollection>
+</installer>
diff --git a/src/module_cadastre/web_service/class/majic_lib/CHANGE_LOG.txt b/src/module_cadastre/web_service/class/majic_lib/CHANGE_LOG.txt
new file mode 100755
index 0000000000000000000000000000000000000000..39048bfeabdf4b48d273be99b7e2596b028b4617
--- /dev/null
+++ b/src/module_cadastre/web_service/class/majic_lib/CHANGE_LOG.txt
@@ -0,0 +1,11 @@
+
+              +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+              +                                                                                   +
+              +                   VEREMES - changelog de Majic_lib		                  +
+              +                                                                                   +
+              +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+
+__________________________________________________________________________________________________________________
+|b4379|NOUVEAUTE   |RELEASE| VERSION 2011.1 Rajout du champ TAXE AD qui correspond aux taxes additionnelles sur les parcelles. Cette mise � jour s'applique sur la version 2011 applicable sur les donn�es 2012 
+|
diff --git a/src/module_cadastre/web_service/class/majic_lib/Mj.class.inc b/src/module_cadastre/web_service/class/majic_lib/Mj.class.inc
new file mode 100755
index 0000000000000000000000000000000000000000..6a929471084860bd679759adf84539750a41ffdb
--- /dev/null
+++ b/src/module_cadastre/web_service/class/majic_lib/Mj.class.inc
@@ -0,0 +1,119 @@
+<?php
+
+/**
+ * \file Mj.class.inc
+ * \brief Mj.class.inc \n \n Ce fichier contient la classe php Mj.
+ * 
+ * Cette classe est une classe virtuelle qui peut �tre appel� par les autres classes de la librairie majic_lib par h�ritage.
+ *
+ * \author Damien Bedel <damien.bedel@veremes.com>
+ * \author Olivier Gayte <olivier.gayte@veremes.com>
+ */
+/**
+ * \class Mj
+ * \brief Mj Class \n \n Mj est une classe PHP.
+ * 
+ * Cette classe permet de retourner un objet de s�lection dans une table sous la forme d'un tableau HTML.
+ *
+ * \author Damien Bedel
+ * \author Olivier Gayte <olivier.gayte@veremes.com>
+ */
+require_once __DIR__ . "/../vitis_lib/XmlAbstract.class.inc";
+
+class Mj extends XmlAbstract {
+
+    /**
+     * Requ�te SQL de s�lection dans la table.
+     */
+    var $sSql;
+
+    /**
+     * Statut de l'objet cr�e lors de la requ�te. 1 si erreur; 0 si l'objet a pu �tre instanci�.
+     */
+    var $sStatus = 0;
+
+    /**
+     * Message d'erreur.
+     */
+    var $sMessage;
+
+    /**
+     * Nom du fichier SQL.
+     */
+    var $sRessourcesFile = 'Mj.sql.inc';
+
+    /**
+     * Clef de cryptage
+     */
+    var $sEncryptKey = '';
+
+    /**
+     * Clef de cryptage
+     */
+    var $bAllSuf = false;
+
+    /**
+     * Cette m�thode permet de retourner un code d'erreur en fonction du statut de l'objet r�sultant de la s�lection.
+     * \return Retourne 1 s'il y a une erreur, 0 si ok.
+     */
+    function isError() {
+        if ($this->sStatus == 1) {
+            return 1;
+        } else {
+            return 0;
+        }
+    }
+
+    /**
+     * Cette m�thode permet de renvoyer un message d'erreur.
+     * \return Retourne une cha�ne de caract�res.
+     */
+    function getMessage() {
+        return $this->sMessage;
+    }
+
+    function encrypt($cleartext) {
+        if ($this->sEncryptKey != '') {
+            if (empty($cleartext) || USE_ENCRYPTION == false) {
+                return $cleartext;
+            }
+            $cipher = mcrypt_module_open(MCRYPT_BLOWFISH, '', MCRYPT_MODE_CBC, '');
+            $key = substr($this->sEncryptKey, 0, mcrypt_enc_get_key_size($cipher));
+            $iv = '00000000';
+
+            // add the padding.
+            $cleartext_length = strlen($cleartext) % 8;
+            for ($i = $cleartext_length; $i < 8; $i++) {
+                $cleartext .= chr(8 - $cleartext_length);
+            }
+
+            $ciphertext = '';
+            // 128-bit Blowfish encryption:
+            if (mcrypt_generic_init($cipher, $key, $iv) != - 1) {
+                // PHP pads with NULL bytes if $cleartext IS NOT a multiple of the block size ..
+                if (empty($cleartext)) {
+                    return '';
+                }
+                $ciphertext = mcrypt_generic($cipher, $cleartext);
+                mcrypt_generic_deinit($cipher);
+            }
+
+            return base64_encode($ciphertext);
+        } else {
+            return $cleartext;
+        }
+    }
+
+    function getObjects($sClasse) {
+        $aObjClass = array();
+        foreach ($this->aObjects as $oObj) {
+            if (get_class($oObj) == $sClasse) {
+                array_push($aObjClass, $oObj);
+            }
+        }
+        return $aObjClass;
+    }
+
+}
+
+?>
\ No newline at end of file
diff --git a/src/module_cadastre/web_service/class/majic_lib/Mj.sql.inc b/src/module_cadastre/web_service/class/majic_lib/Mj.sql.inc
new file mode 100755
index 0000000000000000000000000000000000000000..2038a07fe68af9e0da67e66cc4b6ed3a8324afad
--- /dev/null
+++ b/src/module_cadastre/web_service/class/majic_lib/Mj.sql.inc
@@ -0,0 +1,122 @@
+<?php
+$aSql['pgsql']['proprietaire']= 'SELECT "ID_DNUPRO" as id_dnupro, "DNUPRO" as "dnupro", "ID_PRO" as id_pro, "L_CCODRO" as l_ccodro, "L_CCODEM" as l_ccodem, "DNUPER" as dnuper, "DQUALP" as dqualp, "DDENOM" as ddenom, "DNOMLP" as dnomlp, "DPRNLP" as dprnlp, "EPXNEE" as epxnee, "DNOMCP" as dnomcp, "DPRNCP" as dprncp, "JDATNSS" as jdatnss, "DLDNSS" as dldnss, "DLIGN3" as dlign3, "DLIGN4" as dlign4, "DLIGN5" as dlign5, "DLIGN6" as dlign6, "GTOPER" as gtoper FROM majic."PROPRIETAIRE_COURANT" LEFT JOIN majic."tc_CCODRO_code_droit" ON "PROPRIETAIRE_COURANT"."CCODRO"="tc_CCODRO_code_droit"."CCODRO" LEFT JOIN majic."tc_CCODEM_Nature_demembrement" ON "PROPRIETAIRE_COURANT"."CCODEM"="tc_CCODEM_Nature_demembrement"."CCODEM" WHERE "ID_DNUPRO"=\'$sIdDnupro\' AND "ID_PRO"=\'$sIdPro\'';
+$aSql['pgsql']['bati'] = 'SELECT "FANTOIR_COMMUNE"."LIBCOM" as libcom, "BATI_A00_IDENT_LOCAL"."DNBNIV" as dnbniv,"BATI_A00_IDENT_LOCAL"."JDATAT" as jdatat, "BATI_A00_IDENT_LOCAL"."JANNAT" as jannat,"BATI_A00_IDENT_LOCAL"."DNATLC" as dnatlc, "BATI_A00_IDENT_LOCAL"."ID_DNUPRO" as b_iddnupro, "BATI_A00_IDENT_LOCAL"."DNUPRO" as b_dnupro, "BATI_A00_IDENT_LOCAL"."ID_BAT" as id_bat, "BATI_A00_IDENT_LOCAL"."DTELOC" as dteloc, "tc_DTELOC_Type_local"."L_DTELOC" as dteloc, "BATI_A00_IDENT_LOCAL"."DVLTRT" as dvltrt, "JDATAT" as jdatat, "CCOSEC" as ccosec, "DNUPLA" as dnupla, "CCOPLC" as ccoplc, "DNVOIRI" as dnvoiri, "DINDIC" as dindic, "DVOILIB" as dvoilib, "CCORIV" as ccoriv, "DNUBAT" as dnubat, "DESC" as desc, "DNIV" as dniv, "DPOR" as dpor, "BATI_A00_IDENT_LOCAL"."INVAR" as invar, "CCOEVA" as ccoeva, "BATI_A00_IDENT_LOCAL"."CCONLC" as cconlc, "L_CCONLC" AS lib_cconlc, "DVLPERA" as dvlpera, "GTAUOM" as gtauom, "CCONAD" as cconad, "LOT_LOCAL"."ID_BAT" as Local_id_bat,	"LOT_LOCAL"."DNUMQL" as dnumql,	"LOT_LOCAL"."DDENQL" as ddenql FROM majic."BATI_A00_IDENT_LOCAL" LEFT JOIN majic."BATI_A60_DESCR_DEPEND" ON "BATI_A00_IDENT_LOCAL"."ID_BAT"="BATI_A60_DESCR_DEPEND"."ID_BAT" LEFT JOIN majic."BATI_A21_DESCR_PEV" ON "BATI_A00_IDENT_LOCAL"."ID_BAT"="BATI_A21_DESCR_PEV"."ID_BAT"  LEFT JOIN majic."tc_DTELOC_Type_local" ON "BATI_A00_IDENT_LOCAL"."DTELOC"="tc_DTELOC_Type_local"."DTELOC" LEFT JOIN majic."LOT_LOCAL" ON "BATI_A00_IDENT_LOCAL"."ID_BAT"="LOT_LOCAL"."ID_BAT" LEFT JOIN majic."FANTOIR_COMMUNE" ON "BATI_A00_IDENT_LOCAL"."CCOCOM"="FANTOIR_COMMUNE"."CCOCOM" LEFT JOIN majic."tc_CCONLC_Nature_local" ON "BATI_A00_IDENT_LOCAL"."CCONLC"="tc_CCONLC_Nature_local"."CCONLC" WHERE "BATI_A00_IDENT_LOCAL"."ID_BAT"=\'$sIdBat\' ORDER BY "CCOSEC","DNUPLA","BATI_A00_IDENT_LOCAL"."INVAR"';
+$aSql['pgsql']['habit_descr'] = 'SELECT "DNUPEV" as dnupev, "INVAR" as invar, "CCONAD1" as cconad1, "CCONAD2" as cconad2, "CCONAD3" as cconad3, "CCONAD4" as cconad4,"DSUEIC1" as dsueic1, "DSUEIC2" as dsueic2, "DSUEIC3" as dsueic3, "DSUEIC4" as dsueic4, "GEAULC" as geaulc, "GELELC" as gelelc, "GESCLC" as gesclc, "GGAZLC" as ggazlc, "GASCLC" as gasclc, "GCHCLC" as gchclc, "GVORLC" as gvorlc, "GTEGLC" as gteglc, "DNBBAI" as dnbbai, "DNBDOU" as dnbdou, "DNBLAV" as dnblav, "DNBWC" as dnbwc, "DNBPPR" as dnbppr, "DNBSAM" as dnbsam, "DNBCHA" as dnbcha, "DNBCU8" as dnbcu8, "DNBCU9" as dnbcu9, "DNBSEA" as dnbsea, "DNBANN" as dnbann, "DNBPDC" as dnbpdc, "DSUPDC" as dsupdc, "DMATGM" as dmatgm, "DMATTO" as dmatto, "JANNAT" as jannat, "DETENT" as detent, "DNBNIV" as dnbniv FROM majic."BATI_A40_DESCR_HABIT" WHERE "ID_PEV"=\'$sIdPev\' AND "DNUDES"=\'$sDnudes\'';
+$aSql['pgsql']['depend_descr'] = 'SELECT "DNUDES" as dnudes, "DNUPEV" as dnupev, "INVAR" as invar, "BATI_A60_DESCR_DEPEND"."CCONAD" as cconad, "tc_CCONAD_Nature_dependance"."L_CCONAD" AS l_cconad, "DSUDEP" as dsudep, "DCIMLC" as dcimlc, "GEAULC" as geaulc, "GEAULC" as geaulc, "GELELC" as gelelc, "GCHCLC" as gchclc, "DNBBAI" as dnbbai, "DNBDOU" as dnbdou, "DNBLAV" as dnblav, "DNBWC" as dnbwc, "DMATGM" as dmatgm, "DMATTO" as dmatto, "DETENT" as detent FROM majic."BATI_A60_DESCR_DEPEND" INNER JOIN majic."tc_CCONAD_Nature_dependance" ON "BATI_A60_DESCR_DEPEND"."CCONAD"="tc_CCONAD_Nature_dependance"."CCONAD" WHERE "ID_DEP"=\'$sIdDep\'';
+$aSql['pgsql']['prof_descr'] = 'SELECT "DNUDES" as dnudes, "DNUPEV" as dnupev, "INVAR" as invar, "VSURZT" as vsurzt  FROM majic."BATI_A50_DESCR_PROF" WHERE "ID_PEV"=\'$sIdPev\'';
+$aSql['pgsql']['pev'] = 'SELECT "BATI_A21_DESCR_PEV"."ID_PEV" as id_pev, "CCOSTB" as ccostb, "CCOAFF" as ccoaff, "DCAPEC" as dcapec, "DCSGLC" as dcsglc, "BIPEVLA1" as bipevla1, "GNEXPL" as gnexpl, "DVLPERA" as dvlpera, "BATI_A21_DESCR_PEV"."DNUPEV" as dnupev, "BATI_A21_DESCR_PEV"."DVLPER" as dvlper, "BATI_A21_DESCR_PEV"."DNUREF" as dnuref FROM majic."BATI_A21_DESCR_PEV" LEFT JOIN majic."BATI_A36_TAXATION_PEV" ON "BATI_A21_DESCR_PEV"."ID_PEV"="BATI_A36_TAXATION_PEV"."ID_PEV" WHERE "BATI_A21_DESCR_PEV"."ID_PEV"=\'$sIdPev\'';
+$aSql['pgsql']['parcelle']='SELECT "ID_PAR" as id_par, "JDATAT" as jdatat,"CCOSEC" as ccosec, "DNUPLA" as dnupla, "DNVOIRI" as dnvoiri, "DINDIC" as dindic, "CCONVO" as cconvo, "DVOILIB" as dvoilib,"TYPEVOIE" as typevoie,"CCORIV" as ccoriv, "DPARPI" as dparpi, "GPARNF" as gparnf, "DCNTPA" as dcntpa, "DNUPRO" as dnupro , "GPARBAT" as gparbat FROM majic."NON_BATI_A10_DESCR_PARCELLE" LEFT JOIN majic."FANTOIR_VOIE" ON "NON_BATI_A10_DESCR_PARCELLE"."ID_RIVOLI"="FANTOIR_VOIE"."ID_RIVOLI" WHERE "ID_PAR"=\'$sIdPar\'';
+$aSql['pgsql']['suf']='SELECT "DNUPRO" as dnupro,"NON_BATI_A21_DESCR_SUF"."CCODEP" || "NON_BATI_A21_DESCR_SUF"."CCOCOM" || "NON_BATI_A21_DESCR_SUF"."DNUPRO" as "id_dnupro" ,"ID_SUF" as id_suf,"GNEXPS" as gnexps,"CCOSTN" as ccostn,"CCOSUB" as ccosub,"NON_BATI_A21_DESCR_SUF"."DSGRPF" as dsgrpf,"L_DSGRPF" as l_dsgrpf, "DCLSSF" as dclssf, "CNATSP" as cnatsp, "DCNTSF" as dcntsf,"DRCSUBA" as drcsuba, "DRCSUB" as drcsub FROM majic."NON_BATI_A21_DESCR_SUF" LEFT JOIN majic."tc_DSGRPF_SousGroupe_suf" ON "NON_BATI_A21_DESCR_SUF"."DSGRPF" = "tc_DSGRPF_SousGroupe_suf"."DSGRPF" WHERE "ID_SUF"=\'$sIdSuf\'';
+$aSql['pgsql']['suf_bnd']='SELECT DISTINCT "ID_SUF" as id_suf,"DNUPRO" as dnupro,"NON_BATI_A21_DESCR_SUF"."CCODEP" || "NON_BATI_A21_DESCR_SUF"."CCOCOM" || "NON_BATI_A21_DESCR_SUF"."DNUPRO" as "id_dnupro" ,"GNEXPS" as gnexps,"CCOSTN" as ccostn,"CCOSUB" as ccosub,"NON_BATI_A21_DESCR_SUF"."DSGRPF" as dsgrpf,"L_DSGRPF" as l_dsgrpf, "DCLSSF" as dclssf, "CNATSP" as cnatsp, "DCNTSF" as dcntsf,"DRCSUBA" as drcsuba, "DRCSUB" as drcsub, "NON_BATI_A21_DESCR_SUF"."DNUPDL" AS dnupdl, "NON_BATI_A21_DESCR_SUF"."DNULOT" AS dnulot, "DNUMQL" AS dnumql, "DDENQL" AS ddenql FROM (majic."NON_BATI_A21_DESCR_SUF" LEFT JOIN majic."tc_DSGRPF_SousGroupe_suf" ON "NON_BATI_A21_DESCR_SUF"."DSGRPF" = "tc_DSGRPF_SousGroupe_suf"."DSGRPF") LEFT JOIN majic."LOT_A30_DESCR_LOT" ON "LOT_A30_DESCR_LOT"."KLOT"="NON_BATI_A21_DESCR_SUF"."KLOT_" WHERE "ID_SUF"=\'$sIdSuf\'';
+$aSql['pgsql']['suf_dnupro']='SELECT "NON_BATI_A21_DESCR_SUF"."DNUPRO" as dnupro FROM majic."NON_BATI_A10_DESCR_PARCELLE" RIGHT JOIN majic."NON_BATI_A21_DESCR_SUF" ON "NON_BATI_A10_DESCR_PARCELLE"."ID_PAR"="NON_BATI_A21_DESCR_SUF"."ID_PAR" WHERE "ID_SUF"=\'$sIdSuf\'';
+$aSql['pgsql']['compte_communal']='SELECT "PROPRIETAIRE_COURANT"."CCODEP" as ccodep, "PROPRIETAIRE_COURANT"."CCODIR" as ccodir, "PROPRIETAIRE_COURANT"."CCOCOM" as ccocom, "LIBCOM" as libcom, "DNUPRO" as dnupro, "ID_DNUPRO" as id_dnupro FROM majic."PROPRIETAIRE_COURANT" LEFT JOIN majic."FANTOIR_COMMUNE" ON "PROPRIETAIRE_COURANT"."ID_COM"="FANTOIR_COMMUNE"."ID_COM" WHERE "ID_DNUPRO"=\'$sIdDnupro\'';
+$aSql['pgsql']['bati_parcelle']='SELECT "ID_PAR" as id_par, "PROPRIETAIRE_COURANT"."CCODEP" as ccodep, "PROPRIETAIRE_COURANT"."CCODIR" as ccodir, "PROPRIETAIRE_COURANT"."CCOCOM" as ccocom, "LIBCOM" as libcom, "PROPRIETAIRE_COURANT"."DNUPRO" as dnupro, "PROPRIETAIRE_COURANT"."ID_DNUPRO" as id_dnupro, "NON_BATI_A10_DESCR_PARCELLE"."DNVOIRI" as dnvoiri, "NON_BATI_A10_DESCR_PARCELLE"."DINDIC" as dindic, "CCONVO" as cconvo, "DVOILIB" as dvoilib, "DCNTPA" AS dcntpa FROM majic."NON_BATI_A10_DESCR_PARCELLE" INNER JOIN majic."PROPRIETAIRE_COURANT" ON "NON_BATI_A10_DESCR_PARCELLE"."ID_DNUPRO"="PROPRIETAIRE_COURANT"."ID_DNUPRO" LEFT JOIN majic."FANTOIR_COMMUNE" ON "NON_BATI_A10_DESCR_PARCELLE"."ID_COM"="FANTOIR_COMMUNE"."ID_COM" WHERE "ID_PAR"=\'sIdPar\'';
+$aSql['pgsql']['exone_pev']='SELECT "ID_EX" as id_ex, "CCOLLOC" as ccolloc, "GNEXTL" as gnextl, "JANIMP" as janimp, "JANDEB" as jandeb, "RCEXBA2" as rcexba2, "PEXB" as pexb FROM majic."BATI_A30_EXONE_PEV" WHERE "ID_EX"=\'$sIdEx\'';
+$aSql['pgsql']['exon_suf']='SELECT "ID_SUF" as id_suf, "RNUEXN" as rnuexn, "CCOLLOC" as ccolloc, "GNEXTS" as gnexts, "JFINEX" as jfinex, "PEXN" as pexn,"RCEXNBA" as rcexnba FROM majic."NON_BATI_A30_EXON_SUF" WHERE "ID_SUF"=\'$sIdSuf\' and "RNUEXN"=\'$sRnuexn\'';
+$aSql['pgsql']['lot_local']='SELECT "ID_BAT" as id_bat, "KLOT" as klot, "DNUPDL" as dnupdl, "DNULOT" as dnulot, "DNUMQL" as dnumql, "DDENQL" as ddenql FROM majic."LOT_LOCAL" WHERE "ID_BAT"=\'$sIdBat\' and "KLOT"=\'$sKlot\'';
+$aSql['pgsql']['get_id_pev']='SELECT "ID_PEV" as id_pev FROM majic."BATI_A21_DESCR_PEV" WHERE "ID_BAT"=\'$sIdBat\' ORDER BY "ID_PEV"';
+$aSql['pgsql']['get_id_ex_pev']='SELECT "ID_EX" as id_ex FROM majic."BATI_A30_EXONE_PEV" WHERE "ID_PEV"=\'$sIdPev\' ORDER BY "ID_EX"';
+$aSql['pgsql']['get_id_descr_hab']='SELECT "DNUDES" as dnudes, "ID_PEV" as id_pev FROM majic."BATI_A40_DESCR_HABIT" WHERE "ID_PEV"=\'$sIdPev\' ORDER BY "DNUDES"';
+$aSql['pgsql']['get_id_descr_depend']='SELECT "ID_DEP" as id_dep FROM majic."BATI_A60_DESCR_DEPEND" WHERE "ID_PEV"=\'$sIdPev\' ORDER BY "ID_DEP"';
+$aSql['pgsql']['get_klot']='SELECT "KLOT" as klot FROM majic."LOT_LOCAL" WHERE "ID_BAT"=\'$sIdBat\' ORDER BY "KLOT"';
+$aSql['pgsql']['get_id_suf']='SELECT "ID_SUF" as id_suf FROM majic."NON_BATI_A10_DESCR_PARCELLE" RIGHT JOIN majic."NON_BATI_A21_DESCR_SUF" ON "NON_BATI_A10_DESCR_PARCELLE"."ID_PAR"="NON_BATI_A21_DESCR_SUF"."ID_PAR" WHERE ("NON_BATI_A10_DESCR_PARCELLE"."DNUPRO"=\'sDnupro\' OR "NON_BATI_A21_DESCR_SUF"."DNUPRO"=\'sDnupro\') AND "NON_BATI_A21_DESCR_SUF"."ID_PAR"=\'sIdPar\' AND ("NON_BATI_A10_DESCR_PARCELLE"."ID_DNUPRO"=\'sIdDnupro\' OR "NON_BATI_A21_DESCR_SUF"."DNUPRO"=\'sDnupro\')';
+$aSql['pgsql']['get_rnuexn']='SELECT DISTINCT "RNUEXN" as rnuexn FROM majic."NON_BATI_A30_EXON_SUF" WHERE "ID_SUF"=\'$sIdSuf\' ORDER BY "RNUEXN"';
+$aSql['pgsql']['get_id_pro']='SELECT DISTINCT "ID_PRO" as id_pro FROM majic."PROPRIETAIRE_COURANT" WHERE "ID_DNUPRO"=\'$sIdDnupro\' ORDER BY "ID_PRO"';
+$aSql['pgsql']['get_id_bat']='SELECT "ID_BAT" as id_bat FROM majic."BATI_A00_IDENT_LOCAL" WHERE "ID_DNUPRO"=\'$sIdDnupro\' ORDER BY "ID_BAT"';
+$aSql['pgsql']['get_id_par']='SELECT DISTINCT "NON_BATI_A10_DESCR_PARCELLE"."ID_PAR" as id_par FROM majic."NON_BATI_A10_DESCR_PARCELLE" LEFT JOIN majic."NON_BATI_A21_DESCR_SUF" ON "NON_BATI_A10_DESCR_PARCELLE"."ID_PAR"="NON_BATI_A21_DESCR_SUF"."ID_PAR" WHERE ("NON_BATI_A10_DESCR_PARCELLE"."DNUPRO"=\'sDnupro\' OR "NON_BATI_A21_DESCR_SUF"."DNUPRO"=\'sDnupro\') AND "NON_BATI_A21_DESCR_SUF"."ID_COM"=\'sIdCom\' ORDER BY "NON_BATI_A10_DESCR_PARCELLE"."ID_PAR"';
+$aSql['pgsql']['get_id_par_bnd']='SELECT "NON_BATI_A10_DESCR_PARCELLE"."ID_PAR" as "id_par" FROM majic."NON_BATI_A21_DESCR_SUF" INNER JOIN majic."NON_BATI_A10_DESCR_PARCELLE" ON "NON_BATI_A21_DESCR_SUF"."ID_PAR" = "NON_BATI_A10_DESCR_PARCELLE"."ID_PAR" WHERE "NON_BATI_A21_DESCR_SUF"."DNUPRO" = \'sDnupro\' AND "NON_BATI_A10_DESCR_PARCELLE"."ID_DNUPRO" != \'sIdDnupro\' AND "NON_BATI_A10_DESCR_PARCELLE"."ID_COM"=\'sIdCom\'';
+$aSql['pgsql']['get_par_id_bat']='SELECT "ID_BAT" as id_bat FROM majic."BATI_A00_IDENT_LOCAL" WHERE "ID_PAR"=\'sIdPar\' ORDER BY "ID_BAT"';
+$aSql['pgsql']['annee_reference']='SELECT "ANNEE" FROM majic."ANNEE_REFERENCE"';
+$aSql['pgsql']['get_id_dnupro']='SELECT "ID_DNUPRO" as iddnupro, "DNUPRO" as dnupro FROM majic."NON_BATI_A10_DESCR_PARCELLE" WHERE "ID_PAR"=\'idparpro\'';
+$aSql['pgsql']['compte_communal_parcelle']='SELECT "PROPRIETAIRE_COURANT"."CCODEP" as ccodep, "LIBDEP" as libdep, "PROPRIETAIRE_COURANT"."CCODIR" as ccodir, "PROPRIETAIRE_COURANT"."CCOCOM" as ccocom, "LIBCOM" as libcom, "PROPRIETAIRE_COURANT". "DNUPRO" as dnupro,"PROPRIETAIRE_COURANT"."ID_DNUPRO" as id_dnupro, "ID_PAR" as id_par FROM majic."NON_BATI_A10_DESCR_PARCELLE", majic."PROPRIETAIRE_COURANT" LEFT JOIN majic."FANTOIR_COMMUNE" ON "PROPRIETAIRE_COURANT"."ID_COM"="FANTOIR_COMMUNE"."ID_COM" LEFT JOIN majic."FANTOIR_DIRECTION" ON "FANTOIR_COMMUNE"."CCODEP"= "FANTOIR_DIRECTION"."CCODEP" WHERE "PROPRIETAIRE_COURANT"."ID_DNUPRO"=\'$sIdDnupro\' and "ID_PAR"=\'$sIdPar\'';
+$aSql['pgsql']['get_id_bat_parcelle']='SELECT "ID_BAT" as id_bat FROM majic."BATI_A00_IDENT_LOCAL" WHERE "ID_DNUPRO"=\'$sIdDnupro\' and "ID_PAR"=\'$sIdPar\' ORDER BY "ID_BAT"';
+/*$aSql['pgsql']['emprise']['bati']='SELECT "ID_PAR" as id_par, "JDATAT" as jdatat, "CCOSEC" as ccosec, "DNUPLA" as dnupla, "DNVOIRI" as dnvoiri, "DINDIC" as dindic, "CCONVO" as cconvo, "DVOILIB" as dvoilib, "CCORIV" as ccoriv, "DPARPI" as dparpi, "GPARNF" as gparnf, "DCNTPA" as dcntpa, "DNUPRO" as dnupro FROM majic."NON_BATI_A10_DESCR_PARCELLE" WHERE "ID_PAR"=\'$sIdPar\'';
+$aSql['pgsql']['emprise']['pos']='SELECT "ID_PAR" as id_par, "JDATAT" as jdatat, "CCOSEC" as ccosec, "DNUPLA" as dnupla, "DNVOIRI" as dnvoiri, "DINDIC" as dindic, "CCONVO" as cconvo, "DVOILIB" as dvoilib, "CCORIV" as ccoriv, "DPARPI" as dparpi, "GPARNF" as gparnf, "DCNTPA" as dcntpa, "DNUPRO" as dnupro FROM majic."NON_BATI_A10_DESCR_PARCELLE" WHERE "ID_PAR"=\'$sIdPar\'';
+$aSql['pgsql']['emprise']['plu']='SELECT "ID_PAR" as id_par, "JDATAT" as jdatat, "CCOSEC" as ccosec, "DNUPLA" as dnupla, "DNVOIRI" as dnvoiri, "DINDIC" as dindic, "CCONVO" as cconvo, "DVOILIB" as dvoilib, "CCORIV" as ccoriv, "DPARPI" as dparpi, "GPARNF" as gparnf, "DCNTPA" as dcntpa, "DNUPRO" as dnupro FROM majic."NON_BATI_A10_DESCR_PARCELLE" WHERE "ID_PAR"=\'$sIdPar\'';
+*/
+
+
+
+
+
+
+
+
+
+$aSql['oci']['proprietaire']= 'SELECT "ID_DNUPRO" as "id_dnupro", "DNUPRO" as "dnupro", "ID_PRO" as "id_pro", "L_CCODRO" as "l_ccodro", "L_CCODEM" as "l_ccodem", "DNUPER" as "dnuper", "DQUALP" as "dqualp", "DDENOM" as "ddenom", "DNOMLP" as "dnomlp", "DPRNLP" as "dprnlp", "EPXNEE" as "epxnee", "DNOMCP" as "dnomcp", "DPRNCP" as "dprncp", TO_CHAR("JDATNSS" , \'DD/MM/YYYY\') as "jdatnss", "DLDNSS" as "dldnss", "DLIGN3" as "dlign3", "DLIGN4" as "dlign4", "DLIGN5" as "dlign5", "DLIGN6" as "dlign6", "GTOPER" as "gtoper" FROM majic."PROPRIETAIRE_COURANT" LEFT JOIN majic."tc_CCODRO_code_droit" ON "PROPRIETAIRE_COURANT"."CCODRO"="tc_CCODRO_code_droit"."CCODRO" LEFT JOIN majic."tc_CCODEM_Nature_demembrement" ON "PROPRIETAIRE_COURANT"."CCODEM"="tc_CCODEM_Nature_demembrement"."CCODEM" WHERE "ID_DNUPRO"=\'$sIdDnupro\' AND "ID_PRO"=\'$sIdPro\'';
+$aSql['oci']['bati'] = 'SELECT "FANTOIR_COMMUNE"."LIBCOM" as "libcom", "BATI_A00_IDENT_LOCAL"."DNBNIV" as "dnbniv", TO_CHAR("BATI_A00_IDENT_LOCAL"."JDATAT" , \'DD/MM/YYYY\') as "jdatat", "BATI_A00_IDENT_LOCAL"."JANNAT" as "jannat","BATI_A00_IDENT_LOCAL"."DNATLC" as "dnatlc", "BATI_A00_IDENT_LOCAL"."ID_DNUPRO" as "b_iddnupro", "BATI_A00_IDENT_LOCAL"."DNUPRO" as "b_dnupro", "BATI_A00_IDENT_LOCAL"."ID_BAT" as "id_bat", "BATI_A00_IDENT_LOCAL"."DTELOC" as "dteloc", "tc_DTELOC_Type_local"."L_DTELOC" as "dteloc", "BATI_A00_IDENT_LOCAL"."DVLTRT" as "dvltrt", "CCOSEC" as "ccosec", "DNUPLA" as "dnupla", "CCOPLC" as "ccoplc", "DNVOIRI" as "dnvoiri", "DINDIC" as "dindic", "DVOILIB" as "dvoilib", "CCORIV" as "ccoriv", "DNUBAT" as "dnubat", "DESC" as "desc", "DNIV" as "dniv", "DPOR" as "dpor", "BATI_A00_IDENT_LOCAL"."INVAR" as "invar", "CCOEVA" as "ccoeva", "tc_CCONLC_Nature_local"."CCONLC" as "cconlc","DVLPERA" as "dvlpera", "GTAUOM" as "gtauom", "CCONAD" as "cconad", "LOT_LOCAL"."ID_BAT" as "Local_id_bat","LOT_LOCAL"."DNUMQL" as "dnumql","LOT_LOCAL"."DDENQL" as "ddenql", "L_CCONLC" AS "lib_cconlc" FROM majic."BATI_A00_IDENT_LOCAL" LEFT JOIN majic."BATI_A60_DESCR_DEPEND" ON "BATI_A00_IDENT_LOCAL"."ID_BAT"="BATI_A60_DESCR_DEPEND"."ID_BAT" LEFT JOIN majic."BATI_A21_DESCR_PEV" ON "BATI_A00_IDENT_LOCAL"."ID_BAT"="BATI_A21_DESCR_PEV"."ID_BAT"  LEFT JOIN majic."tc_DTELOC_Type_local" ON "BATI_A00_IDENT_LOCAL"."DTELOC"="tc_DTELOC_Type_local"."DTELOC" left join majic."LOT_LOCAL" on "BATI_A00_IDENT_LOCAL"."ID_BAT" ="LOT_LOCAL"."ID_BAT" left join majic."FANTOIR_COMMUNE" on "BATI_A00_IDENT_LOCAL"."ID_COM" ="FANTOIR_COMMUNE"."ID_COM" LEFT JOIN majic."tc_CCONLC_Nature_local" ON "BATI_A00_IDENT_LOCAL"."CCONLC"="tc_CCONLC_Nature_local"."CCONLC"  WHERE "BATI_A00_IDENT_LOCAL"."ID_BAT"=\'$sIdBat\' ORDER BY "CCOSEC","DNUPLA","BATI_A00_IDENT_LOCAL"."INVAR"';
+$aSql['oci']['habit_descr'] = 'SELECT "DNUPEV" as "dnupev", "INVAR" as "invar", "CCONAD1" as "cconad1", "CCONAD2" as "cconad2", "CCONAD3" as "cconad3", "CCONAD4" as "cconad4","DSUEIC1" as "dsueic1", "DSUEIC2" as "dsueic2", "DSUEIC3" as "dsueic3", "DSUEIC4" as "dsueic4", "GEAULC" as "geaulc", "GELELC" as "gelelc", "GESCLC" as "gesclc", "GGAZLC" as "ggazlc", "GASCLC" as "gasclc", "GCHCLC" as "gchclc", "GVORLC" as "gvorlc", "GTEGLC" as "gteglc", "DNBBAI" as "dnbbai", "DNBDOU" as "dnbdou", "DNBLAV" as "dnblav", "DNBWC" as "dnbwc", "DNBPPR" as "dnbppr", "DNBSAM" as "dnbsam", "DNBCHA" as "dnbcha", "DNBCU8" as "dnbcu8", "DNBCU9" as "dnbcu9", "DNBSEA" as "dnbsea", "DNBANN" as "dnbann", "DNBPDC" as "dnbpdc", "DSUPDC" as "dsupdc", "tc_DMATGM_materiaux_gros_murs"."DMATGM" as "dmatgm", "tc_DMATTO_materiaux_toitures"."DMATTO" as "dmatto", "JANNAT" as "jannat", "BATI_A40_DESCR_HABIT"."DETENT" as "detent", "L_DETENT" as "l_detent", "DNBNIV" as "dnbniv", "tc_DMATGM_materiaux_gros_murs"."L_DMATGM" as "lib_dmatgm", "tc_DMATTO_materiaux_toitures"."L_DMATTO" as "lib_dmatto" FROM majic."BATI_A40_DESCR_HABIT" LEFT JOIN majic."tc_DETENT_Etat_entretien" ON "BATI_A40_DESCR_HABIT"."DETENT"="tc_DETENT_Etat_entretien"."DETENT" LEFT JOIN majic."tc_DMATGM_materiaux_gros_murs" ON "BATI_A40_DESCR_HABIT"."DMATGM"="tc_DMATGM_materiaux_gros_murs"."DMATGM" LEFT JOIN majic."tc_DMATTO_materiaux_toitures" ON "BATI_A40_DESCR_HABIT"."DMATTO"="tc_DMATTO_materiaux_toitures"."DMATTO" WHERE "ID_PEV"=\'$sIdPev\'';
+$aSql['oci']['depend_descr'] = 'SELECT "DNUDES" as "dnudes", "DNUPEV" as "dnupev", "INVAR" as "invar", "CCONAD" as "cconad", "DSUDEP" as "dsudep", "DCIMLC" as "dcimlc", "GEAULC" as "geaulc", "GEAULC" as "geaulc", "GELELC" as "gelelc", "GCHCLC" as "gchclc", "DNBBAI" as "dnbbai", "DNBDOU" as "dnbdou", "DNBLAV" as "dnblav", "DNBWC" as "dnbwc", "tc_DMATGM_materiaux_gros_murs"."DMATGM" as "dmatgm", "tc_DMATTO_materiaux_toitures"."DMATTO" as "dmatto", "BATI_A60_DESCR_DEPEND"."DETENT" as "detent", "L_DETENT" as "l_detent", "tc_DMATGM_materiaux_gros_murs"."L_DMATGM" as "lib_dmatgm", "tc_DMATTO_materiaux_toitures"."L_DMATTO" as "lib_dmatto"  FROM majic."BATI_A60_DESCR_DEPEND" LEFT JOIN majic."tc_DETENT_Etat_entretien" ON "BATI_A60_DESCR_DEPEND"."DETENT"="tc_DETENT_Etat_entretien"."DETENT" LEFT JOIN majic."tc_DMATGM_materiaux_gros_murs" ON "BATI_A60_DESCR_DEPEND"."DMATGM"="tc_DMATGM_materiaux_gros_murs"."DMATGM" LEFT JOIN majic."tc_DMATTO_materiaux_toitures" ON "BATI_A60_DESCR_DEPEND"."DMATTO"="tc_DMATTO_materiaux_toitures"."DMATTO" WHERE "ID_PEV"=\'$sIdPev\'';
+$aSql['oci']['prof_descr'] = 'SELECT "DNUDES" as "dnudes", "DNUPEV" as "dnupev", "INVAR" as "invar", "VSURZT" as "vsurzt"  FROM majic."BATI_A50_DESCR_PROF" WHERE "ID_PEV"=\'$sIdPev\'';
+$aSql['oci']['pev'] = 'SELECT  "BATI_A21_DESCR_PEV"."ID_PEV" as "id_pev", "CCOSTB" as "ccostb", "BATI_A21_DESCR_PEV"."CCOAFF" as "ccoaff", "L_CCOAFF" as "l_ccoaff", "DCAPEC" as "dcapec", "DCSGLC" as "dcsglc", "BIPEVLA1" as "bipevla1", "BATI_A21_DESCR_PEV"."GNEXPL" as "gnexpl", "L_GNEXPL" as "l_gnexpl", "DVLPERA" as "dvlpera", "BATI_A21_DESCR_PEV"."DNUPEV" as "dnupev", "BATI_A21_DESCR_PEV"."DVLPER" as "dvlper", "BATI_A21_DESCR_PEV"."DNUREF" as "dnuref" FROM majic."BATI_A21_DESCR_PEV" LEFT JOIN majic."tc_CCOAFF_Affectation_pev" ON "BATI_A21_DESCR_PEV"."CCOAFF"="tc_CCOAFF_Affectation_pev"."CCOAFF" LEFT JOIN majic."tc_GNEXPL_Exone_permanente" ON "BATI_A21_DESCR_PEV"."GNEXPL"="tc_GNEXPL_Exone_permanente"."GNEXPL" LEFT JOIN majic."BATI_A36_TAXATION_PEV" ON "BATI_A21_DESCR_PEV"."ID_PEV"="BATI_A36_TAXATION_PEV"."ID_PEV" WHERE "BATI_A21_DESCR_PEV"."ID_PEV"=\'$sIdPev\'';
+$aSql['oci']['parcelle']='SELECT "ID_PAR" as "id_par", "JDATAT" as "jdatat","CCOSEC" as "ccosec", "DNUPLA" as "dnupla", "DNVOIRI" as "dnvoiri", "DINDIC" as "dindic", "CODEVOIE" as "codevoie", "LIBVOIE" as "libvoie","TYPEVOIE" as "typevoie","CCORIV" as "ccoriv", "DPARPI" as "dparpi", "GPARNF" as "gparnf", Ltrim(TO_CHAR(DCNTPA, \'000000000\')) as "dcntpa", "DNUPRO" as "dnupro" , "GPARBAT" as "gparbat", "GURBPA" as "gurbpa" FROM majic."NON_BATI_A10_DESCR_PARCELLE" LEFT JOIN majic."FANTOIR_VOIE" ON "NON_BATI_A10_DESCR_PARCELLE"."ID_RIVOLI"="FANTOIR_VOIE"."ID_RIVOLI" WHERE "ID_PAR"=\'$sIdPar\' ORDER BY "CCOSEC","DNUPLA"';
+$aSql['oci']['suf']='SELECT "DNUPRO" as "dnupro","NON_BATI_A21_DESCR_SUF"."CCODEP" || "NON_BATI_A21_DESCR_SUF"."CCOCOM" || "NON_BATI_A21_DESCR_SUF"."DNUPRO" as "id_dnupro" ,"ID_SUF" as "id_suf","GNEXPS" as "gnexps","CCOSTN" as "ccostn","CCOSUB" as "ccosub","NON_BATI_A21_DESCR_SUF"."DSGRPF" as "dsgrpf","L_DSGRPF" as "l_dsgrpf", "DCLSSF" as "dclssf", "CNATSP" as "cnatsp", Ltrim(TO_CHAR(DCNTSF, \'000000000\')) as "dcntsf","DRCSUBA" as "drcsuba", "DRCSUB" as "drcsub","NON_BATI_A21_DESCR_SUF"."CGRNUM" as "cgrnum", "L_CGRNUM" as "l_cgrnum" FROM majic."NON_BATI_A21_DESCR_SUF" LEFT JOIN majic."tc_DSGRPF_SousGroupe_suf" ON "NON_BATI_A21_DESCR_SUF"."DSGRPF" = "tc_DSGRPF_SousGroupe_suf"."DSGRPF" LEFT JOIN majic."tc_CGRNUM_Groupe_numerique" ON "NON_BATI_A21_DESCR_SUF"."CGRNUM" = "tc_CGRNUM_Groupe_numerique"."CGRNUM" WHERE "ID_SUF"=\'$sIdSuf\'';
+$aSql['oci']['suf_bnd']='SELECT DISTINCT "ID_SUF" as "id_suf","NON_BATI_A21_DESCR_SUF"."CCODEP" || "NON_BATI_A21_DESCR_SUF"."CCOCOM" || "NON_BATI_A21_DESCR_SUF"."DNUPRO" as "id_dnupro" ,"DNUPRO" as "dnupro","GNEXPS" as "gnexps","CCOSTN" as "ccostn","CCOSUB" as "ccosub","NON_BATI_A21_DESCR_SUF"."DSGRPF" as "dsgrpf","L_DSGRPF" as "l_dsgrpf", "DCLSSF" as "dclssf", "CNATSP" as "cnatsp", Ltrim(TO_CHAR(DCNTSF, \'000000000\')) as "dcntsf","DRCSUBA" as "drcsuba", "DRCSUB" as "drcsub", "NON_BATI_A21_DESCR_SUF"."DNUPDL" AS "dnupdl", "NON_BATI_A21_DESCR_SUF"."DNULOT" AS "dnulot", "DNUMQL" AS "dnumql", "DDENQL" AS "ddenql","NON_BATI_A21_DESCR_SUF"."CGRNUM" as "cgrnum", "L_CGRNUM" as "l_cgrnum" FROM (majic."NON_BATI_A21_DESCR_SUF" LEFT JOIN majic."tc_DSGRPF_SousGroupe_suf" ON "NON_BATI_A21_DESCR_SUF"."DSGRPF" = "tc_DSGRPF_SousGroupe_suf"."DSGRPF") LEFT JOIN majic."tc_CGRNUM_Groupe_numerique" ON "NON_BATI_A21_DESCR_SUF"."CGRNUM" = "tc_CGRNUM_Groupe_numerique"."CGRNUM" LEFT JOIN majic."LOT_A30_DESCR_LOT" ON "LOT_A30_DESCR_LOT"."KLOT"="NON_BATI_A21_DESCR_SUF"."KLOT_" WHERE "ID_SUF"=\'$sIdSuf\' AND "DNUPRO" = \'sIdDnupro\'';
+$aSql['oci']['suf_bnd_all']='SELECT DISTINCT "ID_SUF" as id_suf,"DNUPRO" as dnupro,"NON_BATI_A21_DESCR_SUF"."CCODEP" || "NON_BATI_A21_DESCR_SUF"."CCOCOM" || "NON_BATI_A21_DESCR_SUF"."DNUPRO" as "id_dnupro" ,"GNEXPS" as gnexps,"CCOSTN" as ccostn,"CCOSUB" as ccosub, "NON_BATI_A21_DESCR_SUF"."DSGRPF" as dsgrpf,"L_DSGRPF" as l_dsgrpf, "DCLSSF" as dclssf, "CNATSP" as cnatsp, "DCNTSF" as dcntsf,"DRCSUBA" as drcsuba, "DRCSUB" as drcsub, "DNUPDL" AS dnupdl, "DNULOT" AS dnulot, "DNUMQL" AS dnumql, "DDENQL" AS ddenql, "NON_BATI_A21_DESCR_SUF"."CGRNUM" as "cgrnum", "L_CGRNUM" as "l_cgrnum" FROM "NON_BATI_A21_DESCR_SUF" LEFT JOIN "tc_DSGRPF_SousGroupe_suf" ON "NON_BATI_A21_DESCR_SUF"."DSGRPF" = "tc_DSGRPF_SousGroupe_suf"."DSGRPF" LEFT JOIN "tc_CGRNUM_Groupe_numerique" ON "NON_BATI_A21_DESCR_SUF"."CGRNUM" = "tc_CGRNUM_Groupe_numerique"."CGRNUM" WHERE "ID_SUF"=\'$sIdSuf\'';
+$aSql['oci']['suf_dnupro']='SELECT "NON_BATI_A21_DESCR_SUF"."CCODEP" || "NON_BATI_A21_DESCR_SUF"."CCOCOM" || "NON_BATI_A21_DESCR_SUF"."DNUPRO" as "dnupro" FROM majic."NON_BATI_A10_DESCR_PARCELLE" RIGHT JOIN majic."NON_BATI_A21_DESCR_SUF" ON "NON_BATI_A10_DESCR_PARCELLE"."ID_PAR"="NON_BATI_A21_DESCR_SUF"."ID_PAR" WHERE "ID_SUF"=\'$sIdSuf\'';
+$aSql['oci']['compte_communal']='SELECT "PROPRIETAIRE_COURANT"."CCODEP" as "ccodep", "PROPRIETAIRE_COURANT"."CCODIR" as "ccodir", "PROPRIETAIRE_COURANT"."CCOCOM" as "ccocom", "LIBCOM" as "libcom", "DNUPRO" as "dnupro", "ID_DNUPRO" as "id_dnupro" FROM majic."PROPRIETAIRE_COURANT" LEFT JOIN majic."FANTOIR_COMMUNE" ON "PROPRIETAIRE_COURANT"."ID_COM"="FANTOIR_COMMUNE"."ID_COM" WHERE "ID_DNUPRO"=\'$sIdDnupro\'';
+$aSql['oci']['exone_pev']='SELECT "ID_EX" as "id_ex", "CCOLLOC" as "ccolloc", "GNEXTL" as "gnextl", "JANIMP" as "janimp", "JANDEB" as "jandeb", "RCEXBA2" as "rcexba2", "PEXB" as "pexb" FROM majic."BATI_A30_EXONE_PEV" WHERE "ID_EX"=\'$sIdEx\'';
+$aSql['oci']['exon_suf']='SELECT "ID_SUF" as "id_suf", "RNUEXN" as "rnuexn", "CCOLLOC" as "ccolloc", "GNEXTS" as "gnexts", "JFINEX" as "jfinex", "PEXN" as "pexn","RCEXNBA" as "rcexnba" FROM majic."NON_BATI_A30_EXON_SUF" WHERE "ID_PAR"=(substr(\'$sIdSuf\',0,15)) AND CCOSUB=(substr(\'$sIdSuf\',16)) and "RNUEXN"=\'$sRnuexn\'';
+$aSql['oci']['lot_local']='SELECT "ID_BAT" as "id_bat", "KLOT" as "klot", "DNUPDL" as "dnupdl", "DNULOT" as "dnulot", "DNUMQL" as "dnumql", "DDENQL" as "ddenql" FROM majic."LOT_LOCAL" WHERE "ID_BAT"=\'$sIdBat\' and "KLOT"=\'$sKlot\'';
+$aSql['oci']['get_id_pev']='SELECT "ID_PEV" as "id_pev" FROM majic."BATI_A21_DESCR_PEV" WHERE "ID_BAT"=\'$sIdBat\' ORDER BY "ID_PEV"';
+$aSql['oci']['get_id_ex_pev']='SELECT "ID_EX" as "id_ex" FROM majic."BATI_A30_EXONE_PEV" WHERE "ID_PEV"=\'$sIdPev\' ORDER BY "ID_EX"';
+$aSql['oci']['get_klot']='SELECT "KLOT" as "klot" FROM majic."LOT_LOCAL" WHERE "ID_BAT"=\'$sIdBat\' ORDER BY "KLOT"';
+$aSql['oci']['get_id_suf']='SELECT "ID_SUF" as "id_suf" FROM majic."WS_NON_BATI_A10_DESCR_PARCELLE" RIGHT JOIN majic."NON_BATI_A21_DESCR_SUF" ON "WS_NON_BATI_A10_DESCR_PARCELLE"."ID_PAR"="NON_BATI_A21_DESCR_SUF"."ID_PAR" WHERE ("WS_NON_BATI_A10_DESCR_PARCELLE"."DNUPRO"=\'sIdDnupro\' OR "NON_BATI_A21_DESCR_SUF"."DNUPRO"=\'sDnupro\') AND "NON_BATI_A21_DESCR_SUF"."ID_PAR"=\'sIdPar\' AND ("NON_BATI_A10_DESCR_PARCELLE"."ID_DNUPRO"=\'sIdDnupro\' OR "NON_BATI_A21_DESCR_SUF"."DNUPRO"=\'sDnupro\')';
+$aSql['oci']['get_rnuexn']='SELECT DISTINCT "RNUEXN" as "rnuexn" FROM majic."NON_BATI_A30_EXON_SUF" WHERE "ID_PAR"=(substr(\'$sIdSuf\',0,15)) AND CCOSUB=(substr(\'$sIdSuf\',16)) ORDER BY "RNUEXN"';
+$aSql['oci']['get_id_pro']='SELECT DISTINCT "ID_PRO" as "id_pro", "DNUPER" FROM majic."PROPRIETAIRE_COURANT" WHERE "ID_DNUPRO"=\'$sIdDnupro\' ORDER BY "DNUPER"';
+$aSql['oci']['get_id_bat']='SELECT "ID_BAT" as "id_bat" FROM majic."BATI_A00_IDENT_LOCAL" WHERE "ID_DNUPRO"=\'$sIdDnupro\' ORDER BY "ID_BAT"';
+$aSql['oci']['get_id_par']='SELECT DISTINCT "NON_BATI_A10_DESCR_PARCELLE"."ID_PAR" as "id_par" FROM majic."NON_BATI_A10_DESCR_PARCELLE" LEFT JOIN majic."NON_BATI_A21_DESCR_SUF" ON "NON_BATI_A10_DESCR_PARCELLE"."ID_PAR"="NON_BATI_A21_DESCR_SUF"."ID_PAR" WHERE ("NON_BATI_A10_DESCR_PARCELLE"."DNUPRO"=\'sDnupro\' OR "NON_BATI_A21_DESCR_SUF"."DNUPRO"=\'sDnupro\') AND "NON_BATI_A21_DESCR_SUF"."ID_COM"=\'sIdCom\' ORDER BY "NON_BATI_A10_DESCR_PARCELLE"."ID_PAR"';
+$aSql['oci']['get_id_par_bnd']='SELECT NON_BATI_A10_DESCR_PARCELLE.ID_PAR as "id_par" FROM NON_BATI_A21_DESCR_SUF INNER JOIN NON_BATI_A10_DESCR_PARCELLE ON NON_BATI_A21_DESCR_SUF.ID_PAR = NON_BATI_A10_DESCR_PARCELLE.ID_PAR where NON_BATI_A21_DESCR_SUF.DNUPRO = \'sDnupro\' AND NON_BATI_A10_DESCR_PARCELLE.ID_DNUPRO != \'sIdDnupro\' AND NON_BATI_A10_DESCR_PARCELLE."ID_COM"=\'sIdCom\'';
+$aSql['oci']['annee_reference']='SELECT "ANNEE" FROM majic."ANNEE_REFERENCE"';
+$aSql['oci']['get_id_dnupro']='SELECT "ID_DNUPRO" as "iddnupro", "DNUPRO" as "dnupro" FROM majic."NON_BATI_A10_DESCR_PARCELLE" WHERE "ID_PAR"=\'idparpro\'';
+$aSql['oci']['compte_communal_parcelle']='SELECT "FANTOIR_COMMUNE"."CODE_INSEE" as "codeinsee","PROPRIETAIRE_COURANT"."CCODEP" as "ccodep", "LIBDEP" as "libdep", "PROPRIETAIRE_COURANT"."CCODIR" as "ccodir", "FANTOIR_COMMUNE"."CCOCOM" as "ccocom", "LIBCOM" as "libcom", "PROPRIETAIRE_COURANT"."DNUPRO" as "dnupro","PROPRIETAIRE_COURANT"."ID_DNUPRO" as "id_dnupro", "ID_PAR" as "id_par" FROM majic."NON_BATI_A10_DESCR_PARCELLE", majic."PROPRIETAIRE_COURANT" LEFT JOIN majic."FANTOIR_COMMUNE" ON "PROPRIETAIRE_COURANT"."ID_COM"="FANTOIR_COMMUNE"."ID_COM" LEFT JOIN majic."FANTOIR_DIRECTION" ON "FANTOIR_COMMUNE"."CCODEP"= "FANTOIR_DIRECTION"."CCODEP" WHERE "PROPRIETAIRE_COURANT"."ID_DNUPRO"=\'$sIdDnupro\' and "ID_PAR"=\'$sIdPar\'';
+$aSql['oci']['get_id_bat_parcelle']='SELECT "ID_BAT" as "id_bat" FROM majic."BATI_A00_IDENT_LOCAL" WHERE "ID_DNUPRO"=\'$sIdDnupro\' and "ID_PAR"=\'$sIdPar\' ORDER BY "ID_BAT"';
+$aSql['oci']['get_par_id_bat']='SELECT "ID_BAT" as "id_bat" FROM majic."BATI_A00_IDENT_LOCAL" WHERE "ID_PAR"=\'sIdPar\' ORDER BY "ID_BAT"';
+$aSql['oci']['pos_plu']='SELECT p.GGCODEIDENT, cos, ces, type, hauteur, libelle, SDO_GEOM.SDO_AREA (SDO_GEOM.SDO_INTERSECTION(z.GEOM, p.GEOM, 0.005),0.005) surface  FROM exp_pos.zpos_simpl z RIGHT join cadastre.parcelle_cadastrale_mixee p  ON SDO_RELATE (z.geom,p.geom, \'mask=CONTAINS+INSIDE+OVERLAPBDYINTERSECT+COVERS+COVEREDBY+EQUAL querytype=WINDOW\') = \'TRUE\'  AND z.codcom =p.codcom WHERE z.OBJECTID = \'$sObjectId\' AND p.PAR_ID = \'$sIdPar\' AND p.codcom = \'$sCodCom\' and SDO_GEOM.SDO_AREA (SDO_GEOM.SDO_INTERSECTION(z.GEOM, p.GEOM, 0.005),0.005) >2';
+$aSql['oci']['get_id_pos_plu']='SELECT z.OBJECTID  FROM exp_pos.zpos_simpl z, cadastre.parcelle_cadastrale_mixee p  WHERE SDO_RELATE (z.geom,p.geom, \'mask=CONTAINS+INSIDE+OVERLAPBDYINTERSECT+COVERS+COVEREDBY+EQUAL querytype=WINDOW`\') = \'TRUE\'  AND z.codcom=p.codcom AND p.PAR_ID = \'$sIdPar\' AND p.codcom = \'$sCodCom\'';
+$aSql['oci']['get_codcom']='SELECT NON_BATI_A10_DESCR_PARCELLE.CODE_INSEE FROM MAJIC.NON_BATI_A10_DESCR_PARCELLE WHERE (NON_BATI_A10_DESCR_PARCELLE.ID_PAR =\'$sIdPar\')';
+
+
+
+
+
+
+
+
+
+$aSql['sqlite']['proprietaire']= 'SELECT "ID_DNUPRO" as id_dnupro, "DNUPRO" as "dnupro", "ID_PRO" as id_pro, "L_CCODRO" as l_ccodro, "L_CCODEM" as l_ccodem, "DNUPER" as dnuper, "DQUALP" as dqualp, "DDENOM" as ddenom, "DNOMLP" as dnomlp, "DPRNLP" as dprnlp, "EPXNEE" as epxnee, "DNOMCP" as dnomcp, "DPRNCP" as dprncp, "JDATNSS" as jdatnss, "DLDNSS" as dldnss, "DLIGN3" as dlign3, "DLIGN4" as dlign4, "DLIGN5" as dlign5, "DLIGN6" as dlign6, "GTOPER" as gtoper FROM "PROPRIETAIRE_COURANT" LEFT JOIN "tc_CCODRO_code_droit" ON "PROPRIETAIRE_COURANT"."CCODRO"="tc_CCODRO_code_droit"."CCODRO" LEFT JOIN "tc_CCODEM_Nature_demembrement" ON "PROPRIETAIRE_COURANT"."CCODEM"="tc_CCODEM_Nature_demembrement"."CCODEM" WHERE "ID_DNUPRO"=\'$sIdDnupro\' AND "ID_PRO"=\'$sIdPro\'';
+//modif pas faites sur autre database
+$aSql['sqlite']['bati'] = 'SELECT "FANTOIR_COMMUNE"."LIBCOM" as libcom, "BATI_A00_IDENT_LOCAL"."DNBNIV" as dnbniv,"BATI_A00_IDENT_LOCAL"."JDATAT" as jdatat, "BATI_A00_IDENT_LOCAL"."JANNAT" as jannat,"BATI_A00_IDENT_LOCAL"."DNATLC" as dnatlc, "BATI_A00_IDENT_LOCAL"."ID_DNUPRO" as b_iddnupro, "BATI_A00_IDENT_LOCAL"."DNUPRO" as b_dnupro, "BATI_A00_IDENT_LOCAL"."ID_BAT" as id_bat, "BATI_A00_IDENT_LOCAL"."DTELOC" as dteloc, "tc_DTELOC_Type_local"."L_DTELOC" as dteloc, "BATI_A00_IDENT_LOCAL"."DVLTRT" as dvltrt, "JDATAT" as jdatat, "CCOSEC" as ccosec, "DNUPLA" as dnupla, "CCOPLC" as ccoplc, "DNVOIRI" as dnvoiri, "DINDIC" as dindic, "DVOILIB" as dvoilib, "CCORIV" as ccoriv, "DNUBAT" as dnubat, "DESC" as desc, "DNIV" as dniv, "DPOR" as dpor, "BATI_A00_IDENT_LOCAL"."INVAR" as invar, "CCOEVA" as ccoeva, "tc_CCONLC_Nature_local"."CCONLC" as cconlc,"DVLPERA" as dvlpera, "GTAUOM" as gtauom, "CCONAD" as cconad, "LOT_LOCAL"."ID_BAT" as Local_id_bat,"LOT_LOCAL"."DNUMQL" as dnumql,"LOT_LOCAL"."DDENQL" as ddenql, "L_CCONLC" AS lib_cconlc FROM "BATI_A00_IDENT_LOCAL" LEFT JOIN "BATI_A60_DESCR_DEPEND" ON "BATI_A00_IDENT_LOCAL"."ID_BAT"="BATI_A60_DESCR_DEPEND"."ID_BAT" LEFT JOIN "BATI_A21_DESCR_PEV" ON "BATI_A00_IDENT_LOCAL"."ID_BAT"="BATI_A21_DESCR_PEV"."ID_BAT"  LEFT JOIN "tc_DTELOC_Type_local" ON "BATI_A00_IDENT_LOCAL"."DTELOC"="tc_DTELOC_Type_local"."DTELOC" left join "LOT_LOCAL" on "BATI_A00_IDENT_LOCAL"."ID_BAT" ="LOT_LOCAL"."ID_BAT" left join "FANTOIR_COMMUNE" on "BATI_A00_IDENT_LOCAL"."CCOCOM" ="FANTOIR_COMMUNE"."CCOCOM" LEFT JOIN "tc_CCONLC_Nature_local" ON "BATI_A00_IDENT_LOCAL"."CCONLC"="tc_CCONLC_Nature_local"."CCONLC"  WHERE "BATI_A00_IDENT_LOCAL"."ID_BAT"=\'$sIdBat\' ORDER BY "CCOSEC","DNUPLA","BATI_A00_IDENT_LOCAL"."INVAR"';
+$aSql['sqlite']['habit_descr'] = 'SELECT "DNUPEV" as dnupev, "INVAR" as invar, "CCONAD1" as cconad1, "CCONAD2" as cconad2, "CCONAD3" as cconad3, "CCONAD4" as cconad4,"DSUEIC1" as dsueic1, "DSUEIC2" as dsueic2, "DSUEIC3" as dsueic3, "DSUEIC4" as dsueic4, "GEAULC" as geaulc, "GELELC" as gelelc, "GESCLC" as gesclc, "GGAZLC" as ggazlc, "GASCLC" as gasclc, "GCHCLC" as gchclc, "GVORLC" as gvorlc, "GTEGLC" as gteglc, "DNBBAI" as dnbbai, "DNBDOU" as dnbdou, "DNBLAV" as dnblav, "DNBWC" as dnbwc, "DNBPPR" as dnbppr, "DNBSAM" as dnbsam, "DNBCHA" as dnbcha, "DNBCU8" as dnbcu8, "DNBCU9" as dnbcu9, "DNBSEA" as dnbsea, "DNBANN" as dnbann, "DNBPDC" as dnbpdc, "DSUPDC" as dsupdc, "tc_DMATGM_materiaux_gros_murs"."DMATGM" as "dmatgm", "tc_DMATTO_materiaux_toitures"."DMATTO" as "dmatto", "JANNAT" as jannat, "BATI_A40_DESCR_HABIT"."DETENT" as detent, "L_DETENT" as l_detent, "DNBNIV" as dnbniv, "tc_DMATGM_materiaux_gros_murs"."L_DMATGM" as "lib_dmatgm", "tc_DMATTO_materiaux_toitures"."L_DMATTO" FROM "BATI_A40_DESCR_HABIT" LEFT JOIN "tc_DETENT_Etat_entretien" ON "BATI_A40_DESCR_HABIT"."DETENT"="tc_DETENT_Etat_entretien"."DETENT" LEFT JOIN "tc_DMATGM_materiaux_gros_murs" ON "BATI_A40_DESCR_HABIT"."DMATGM"="tc_DMATGM_materiaux_gros_murs"."DMATGM" LEFT JOIN "tc_DMATTO_materiaux_toitures" ON "BATI_A40_DESCR_HABIT"."DMATTO"="tc_DMATTO_materiaux_toitures"."DMATTO" WHERE "ID_PEV"=\'$sIdPev\'';
+$aSql['sqlite']['depend_descr'] = 'SELECT "DNUDES" as dnudes, "DNUPEV" as dnupev, "INVAR" as invar, "CCONAD" as cconad, "DSUDEP" as dsudep, "DCIMLC" as dcimlc, "GEAULC" as geaulc, "GEAULC" as geaulc, "GELELC" as gelelc, "GCHCLC" as gchclc, "DNBBAI" as dnbbai, "DNBDOU" as dnbdou, "DNBLAV" as dnblav, "DNBWC" as dnbwc, "tc_DMATGM_materiaux_gros_murs"."DMATGM" as "dmatgm", "tc_DMATTO_materiaux_toitures"."DMATTO" as "dmatto", "BATI_A60_DESCR_DEPEND"."DETENT" as detent, "L_DETENT" as l_detent, "tc_DMATGM_materiaux_gros_murs"."L_DMATGM" as "lib_dmatgm", "tc_DMATTO_materiaux_toitures"."L_DMATTO" as "lib_dmatto" FROM "BATI_A60_DESCR_DEPEND" LEFT JOIN "tc_DETENT_Etat_entretien" ON "BATI_A60_DESCR_DEPEND"."DETENT"="tc_DETENT_Etat_entretien"."DETENT" LEFT JOIN "tc_DMATGM_materiaux_gros_murs" ON "BATI_A60_DESCR_DEPEND"."DMATGM"="tc_DMATGM_materiaux_gros_murs"."DMATGM" LEFT JOIN "tc_DMATTO_materiaux_toitures" ON "BATI_A60_DESCR_DEPEND"."DMATTO"="tc_DMATTO_materiaux_toitures"."DMATTO" WHERE "ID_PEV"=\'$sIdPev\'';
+$aSql['sqlite']['prof_descr'] = 'SELECT "DNUDES" as dnudes, "DNUPEV" as dnupev, "INVAR" as invar, "VSURZT" as vsurzt  FROM "BATI_A50_DESCR_PROF" WHERE "ID_PEV"=\'$sIdPev\'';
+$aSql['sqlite']['pev'] = 'SELECT  "BATI_A21_DESCR_PEV"."ID_PEV" as id_pev, "CCOSTB" as ccostb, "BATI_A21_DESCR_PEV"."CCOAFF" as ccoaff, "L_CCOAFF" as "l_ccoaff", "DCAPEC" as dcapec, "DCSGLC" as dcsglc, "BIPEVLA1" as bipevla1, "BATI_A21_DESCR_PEV"."GNEXPL" as gnexpl, "L_GNEXPL" as "l_gnexpl", "DVLPERA" as dvlpera, "BATI_A21_DESCR_PEV"."DNUPEV" as dnupev, "BATI_A21_DESCR_PEV"."DVLPER" as dvlper, "BATI_A21_DESCR_PEV"."DNUREF" as dnuref FROM "BATI_A21_DESCR_PEV" LEFT JOIN "tc_CCOAFF_Affectation_pev" ON "BATI_A21_DESCR_PEV"."CCOAFF"="tc_CCOAFF_Affectation_pev"."CCOAFF" LEFT JOIN "tc_GNEXPL_Exone_permanente" ON "BATI_A21_DESCR_PEV"."GNEXPL"="tc_GNEXPL_Exone_permanente"."GNEXPL" LEFT JOIN "BATI_A36_TAXATION_PEV" ON "BATI_A21_DESCR_PEV"."ID_PEV"="BATI_A36_TAXATION_PEV"."ID_PEV"  WHERE "BATI_A21_DESCR_PEV"."ID_PEV"=\'$sIdPev\'';
+//fin modif
+$aSql['sqlite']['parcelle']='SELECT "ID_PAR" as id_par, "JDATAT" as jdatat,"CCOSEC" as ccosec, "DNUPLA" as dnupla, "DNVOIRI" as dnvoiri, "DINDIC" as dindic, "CODEVOIE" as codevoie, "LIBVOIE" as libvoie,"TYPEVOIE" as typevoie,"CCORIV" as ccoriv, "DPARPI" as dparpi, "GPARNF" as gparnf, "DCNTPA" as dcntpa, "DNUPRO" as dnupro , "GPARBAT" as gparbat FROM "NON_BATI_A10_DESCR_PARCELLE" LEFT JOIN "FANTOIR_VOIE" ON "NON_BATI_A10_DESCR_PARCELLE"."ID_RIVOLI"="FANTOIR_VOIE"."ID_RIVOLI" WHERE "ID_PAR"=\'$sIdPar\' ORDER BY "CCOSEC","DNUPLA"';
+//modif
+$aSql['sqlite']['suf']='SELECT DISTINCT "DNUPRO" as dnupro,"NON_BATI_A21_DESCR_SUF"."CCODEP" || "NON_BATI_A21_DESCR_SUF"."CCOCOM" || "NON_BATI_A21_DESCR_SUF"."DNUPRO" as "id_dnupro" ,"ID_SUF" as id_suf,"GNEXPS" as gnexps,"CCOSTN" as ccostn,"CCOSUB" as ccosub,"NON_BATI_A21_DESCR_SUF"."DSGRPF" as dsgrpf,"L_DSGRPF" as l_dsgrpf, "DCLSSF" as dclssf, "CNATSP" as cnatsp, "DCNTSF" as dcntsf,"DRCSUBA" as drcsuba, "DRCSUB" as drcsub, "NON_BATI_A21_DESCR_SUF"."CGRNUM" as "cgrnum", "L_CGRNUM" as "l_cgrnum" FROM "NON_BATI_A21_DESCR_SUF" LEFT JOIN "tc_DSGRPF_SousGroupe_suf" ON "NON_BATI_A21_DESCR_SUF"."DSGRPF" = "tc_DSGRPF_SousGroupe_suf"."DSGRPF" LEFT JOIN "tc_CGRNUM_Groupe_numerique" ON "NON_BATI_A21_DESCR_SUF"."CGRNUM" = "tc_CGRNUM_Groupe_numerique"."CGRNUM" WHERE "ID_SUF"=\'$sIdSuf\'';
+$aSql['sqlite']['suf_bnd']='SELECT DISTINCT "ID_SUF" as id_suf,"DNUPRO" as dnupro,"NON_BATI_A21_DESCR_SUF"."CCODEP" || "NON_BATI_A21_DESCR_SUF"."CCOCOM" || "NON_BATI_A21_DESCR_SUF"."DNUPRO" as "id_dnupro" ,"GNEXPS" as gnexps,"CCOSTN" as ccostn,"CCOSUB" as ccosub, "NON_BATI_A21_DESCR_SUF"."DSGRPF" as dsgrpf,"L_DSGRPF" as l_dsgrpf, "DCLSSF" as dclssf, "CNATSP" as cnatsp, "DCNTSF" as dcntsf,"DRCSUBA" as drcsuba, "DRCSUB" as drcsub, "DNUPDL" AS dnupdl, "DNULOT" AS dnulot, "DNUMQL" AS dnumql, "DDENQL" AS ddenql, "NON_BATI_A21_DESCR_SUF"."CGRNUM" as "cgrnum", "L_CGRNUM" as "l_cgrnum" FROM "NON_BATI_A21_DESCR_SUF" LEFT JOIN "tc_DSGRPF_SousGroupe_suf" ON "NON_BATI_A21_DESCR_SUF"."DSGRPF" = "tc_DSGRPF_SousGroupe_suf"."DSGRPF" LEFT JOIN "tc_CGRNUM_Groupe_numerique" ON "NON_BATI_A21_DESCR_SUF"."CGRNUM" = "tc_CGRNUM_Groupe_numerique"."CGRNUM" WHERE "ID_SUF"=\'$sIdSuf\' AND "DNUPRO" = \'sIdDnupro\'';
+$aSql['sqlite']['suf_bnd_all']='SELECT DISTINCT "ID_SUF" as id_suf,"DNUPRO" as dnupro,"NON_BATI_A21_DESCR_SUF"."CCODEP" || "NON_BATI_A21_DESCR_SUF"."CCOCOM" || "NON_BATI_A21_DESCR_SUF"."DNUPRO" as "id_dnupro" ,"GNEXPS" as gnexps,"CCOSTN" as ccostn,"CCOSUB" as ccosub, "NON_BATI_A21_DESCR_SUF"."DSGRPF" as dsgrpf,"L_DSGRPF" as l_dsgrpf, "DCLSSF" as dclssf, "CNATSP" as cnatsp, "DCNTSF" as dcntsf,"DRCSUBA" as drcsuba, "DRCSUB" as drcsub, "DNUPDL" AS dnupdl, "DNULOT" AS dnulot, "DNUMQL" AS dnumql, "DDENQL" AS ddenql, "NON_BATI_A21_DESCR_SUF"."CGRNUM" as "cgrnum", "L_CGRNUM" as "l_cgrnum" FROM "NON_BATI_A21_DESCR_SUF" LEFT JOIN "tc_DSGRPF_SousGroupe_suf" ON "NON_BATI_A21_DESCR_SUF"."DSGRPF" = "tc_DSGRPF_SousGroupe_suf"."DSGRPF" LEFT JOIN "tc_CGRNUM_Groupe_numerique" ON "NON_BATI_A21_DESCR_SUF"."CGRNUM" = "tc_CGRNUM_Groupe_numerique"."CGRNUM" WHERE "ID_SUF"=\'$sIdSuf\'';
+//fin modif
+$aSql['sqlite']['compte_communal']='SELECT "PROPRIETAIRE_COURANT"."CCODEP" as ccodep, "PROPRIETAIRE_COURANT"."CCODIR" as ccodir, "PROPRIETAIRE_COURANT"."CCOCOM" as ccocom, "LIBCOM" as libcom, "DNUPRO" as dnupro, "ID_DNUPRO" as id_dnupro FROM "PROPRIETAIRE_COURANT" LEFT JOIN "FANTOIR_COMMUNE" ON "PROPRIETAIRE_COURANT"."ID_COM"="FANTOIR_COMMUNE"."ID_COM" WHERE "ID_DNUPRO"=\'$sIdDnupro\'';
+$aSql['sqlite']['exone_pev']='SELECT "ID_EX" as id_ex, "CCOLLOC" as ccolloc, "GNEXTL" as gnextl, "JANIMP" as janimp, "JANDEB" as jandeb, "RCEXBA2" as rcexba2, "PEXB" as pexb FROM "BATI_A30_EXONE_PEV" WHERE "ID_EX"=\'$sIdEx\'';
+$aSql['sqlite']['exon_suf']='SELECT "ID_SUF" as id_suf, "RNUEXN" as rnuexn, "CCOLLOC" as ccolloc, "GNEXTS" as gnexts, "JFINEX" as jfinex, "PEXN" as pexn,"RCEXNBA" as rcexnba FROM "NON_BATI_A30_EXON_SUF" WHERE "ID_SUF"=\'$sIdSuf\' and "RNUEXN"=\'$sRnuexn\'';
+$aSql['sqlite']['lot_local']='SELECT "ID_BAT" as id_bat, "KLOT" as klot, "DNUPDL" as dnupdl, "DNULOT" as dnulot, "DNUMQL" as dnumql, "DDENQL" as ddenql FROM "LOT_LOCAL" WHERE "ID_BAT"=\'$sIdBat\' and "KLOT"=\'$sKlot\'';
+$aSql['sqlite']['get_id_pev']='SELECT "ID_PEV" as id_pev FROM "BATI_A21_DESCR_PEV" WHERE "ID_BAT"=\'$sIdBat\' ORDER BY "ID_PEV"';
+$aSql['sqlite']['get_id_ex_pev']='SELECT "ID_EX" as id_ex FROM "BATI_A30_EXONE_PEV" WHERE "ID_PEV"=\'$sIdPev\' ORDER BY "ID_EX"';
+$aSql['sqlite']['get_klot']='SELECT "KLOT" as klot FROM "LOT_LOCAL" WHERE "ID_BAT"=\'$sIdBat\' ORDER BY "KLOT"';
+//modif
+$aSql['sqlite']['get_id_suf']='SELECT DISTINCT "ID_SUF" as id_suf FROM "NON_BATI_A21_DESCR_SUF" LEFT JOIN "NON_BATI_A10_DESCR_PARCELLE" ON "NON_BATI_A10_DESCR_PARCELLE"."ID_PAR"="NON_BATI_A21_DESCR_SUF"."ID_PAR" WHERE "NON_BATI_A21_DESCR_SUF"."ID_PAR"=\'sIdPar\' AND ("NON_BATI_A10_DESCR_PARCELLE"."ID_DNUPRO"=\'sIdDnupro\' OR "NON_BATI_A21_DESCR_SUF"."DNUPRO"=\'sDnupro\')';
+$aSql['sqlite']['suf_dnupro']='SELECT "NON_BATI_A21_DESCR_SUF"."CCODEP" || "NON_BATI_A21_DESCR_SUF"."CCOCOM" || "NON_BATI_A21_DESCR_SUF"."DNUPRO" as dnupro FROM "NON_BATI_A21_DESCR_SUF" LEFT JOIN "NON_BATI_A10_DESCR_PARCELLE" ON "NON_BATI_A10_DESCR_PARCELLE"."ID_PAR"="NON_BATI_A21_DESCR_SUF"."ID_PAR" WHERE "ID_SUF"=\'$sIdSuf\'';
+//fin modif
+$aSql['sqlite']['get_rnuexn']='SELECT DISTINCT "RNUEXN" as rnuexn FROM "NON_BATI_A30_EXON_SUF" WHERE "ID_SUF"=\'$sIdSuf\' ORDER BY "RNUEXN"';
+$aSql['sqlite']['get_id_pro']='SELECT DISTINCT "ID_PRO" as id_pro FROM "PROPRIETAIRE_COURANT" WHERE "ID_DNUPRO"=\'$sIdDnupro\' ORDER BY "ID_PRO"';
+$aSql['sqlite']['get_id_bat']='SELECT "ID_BAT" as id_bat FROM "BATI_A00_IDENT_LOCAL" WHERE "ID_DNUPRO"=\'$sIdDnupro\' ORDER BY "ID_BAT"';
+$aSql['sqlite']['get_id_par']='SELECT "ID_PAR" as id_par FROM "NON_BATI_A10_DESCR_PARCELLE" WHERE  "ID_COM"=\'sIdCom\' AND "ID_DNUPRO"=\'sDnupro\' ORDER BY "NON_BATI_A10_DESCR_PARCELLE"."ID_PAR"';
+$aSql['sqlite']['get_id_par_bnd']='SELECT NON_BATI_A10_DESCR_PARCELLE.ID_PAR as "id_par" FROM NON_BATI_A21_DESCR_SUF INNER JOIN NON_BATI_A10_DESCR_PARCELLE ON NON_BATI_A21_DESCR_SUF.ID_PAR = NON_BATI_A10_DESCR_PARCELLE.ID_PAR where NON_BATI_A21_DESCR_SUF.DNUPRO = \'sDnupro\' AND NON_BATI_A10_DESCR_PARCELLE.ID_DNUPRO != \'sIdDnupro\' AND NON_BATI_A10_DESCR_PARCELLE."ID_COM"=\'sIdCom\'';
+$aSql['sqlite']['annee_reference']='SELECT "ANNEE" FROM "ANNEE_REFERENCE"';
+$aSql['sqlite']['get_id_dnupro']='SELECT "ID_DNUPRO" as iddnupro, "DNUPRO" as dnupro FROM "NON_BATI_A10_DESCR_PARCELLE" WHERE "ID_PAR"=\'idparpro\'';
+$aSql['sqlite']['compte_communal_parcelle']='SELECT "FANTOIR_COMMUNE"."CODE_INSEE" as "codeinsee", "PROPRIETAIRE_COURANT"."CCODEP" as ccodep, "LIBDEP" as libdep, "PROPRIETAIRE_COURANT"."CCODIR" as ccodir, "FANTOIR_COMMUNE"."CCOCOM" as ccocom, "LIBCOM" as libcom, "PROPRIETAIRE_COURANT". "DNUPRO" as dnupro,"PROPRIETAIRE_COURANT"."ID_DNUPRO" as id_dnupro, "ID_PAR" as id_par FROM "NON_BATI_A10_DESCR_PARCELLE", "PROPRIETAIRE_COURANT" LEFT JOIN "FANTOIR_COMMUNE" ON "PROPRIETAIRE_COURANT"."ID_COM"="FANTOIR_COMMUNE"."ID_COM" LEFT JOIN "FANTOIR_DIRECTION" ON "FANTOIR_COMMUNE"."CCODEP"= "FANTOIR_DIRECTION"."CCODEP" WHERE "PROPRIETAIRE_COURANT"."ID_DNUPRO"=\'$sIdDnupro\' and "ID_PAR"=\'$sIdPar\'';
+$aSql['sqlite']['get_id_bat_parcelle']='SELECT "ID_BAT" as id_bat FROM "BATI_A00_IDENT_LOCAL" WHERE "ID_DNUPRO"=\'$sIdDnupro\' and "ID_PAR"=\'$sIdPar\' ORDER BY "ID_BAT"';
+$aSql['sqlite']['get_par_id_bat']='SELECT "ID_BAT" as id_bat FROM "BATI_A00_IDENT_LOCAL" WHERE "ID_PAR"=\'sIdPar\' ORDER BY "ID_BAT"';
+?>
\ No newline at end of file
diff --git a/src/module_cadastre/web_service/class/majic_lib/Mj.sql_all.inc b/src/module_cadastre/web_service/class/majic_lib/Mj.sql_all.inc
new file mode 100755
index 0000000000000000000000000000000000000000..1f63bdf05a4596e8e4e00c493efe95fa12b9758d
--- /dev/null
+++ b/src/module_cadastre/web_service/class/majic_lib/Mj.sql_all.inc
@@ -0,0 +1,39 @@
+<?php
+
+$aSql['pgsql']['proprietaire']= 'SELECT *, "ID_DNUPRO" as id_dnupro, "ID_PRO" as id_pro, "L_CCODRO" as l_ccodro, "L_CCODEM" as l_ccodem, "DNUPER" as dnuper, "DQUALP" as dqualp, "DDENOM" as ddenom, "DNOMLP" as dnomlp, "DPRNLP" as dprnlp, "EPXNEE" as epxnee, "DNOMCP" as dnomcp, "DPRNCP" as dprncp, "JDATNSS" as jdatnss, "DLDNSS" as dldnss, "DLIGN3" as dlign3, "DLIGN4" as dlign4, "DLIGN5" as dlign5, "DLIGN6" as dlign6 FROM majic."PROPRIETAIRE_COURANT" LEFT JOIN majic."tc_CCODRO_code_droit" ON "PROPRIETAIRE_COURANT"."CCODRO"="tc_CCODRO_code_droit"."CCODRO" LEFT JOIN majic."tc_CCODEM_Nature_demembrement" ON "PROPRIETAIRE_COURANT"."CCODEM"="tc_CCODEM_Nature_demembrement"."CCODEM" WHERE "ID_DNUPRO"=\'$sIdDnupro\' AND "ID_PRO"=\'$sIdPro\'';
+$aSql['pgsql']['bati'] = 'SELECT *, "BATI_A00_IDENT_LOCAL"."ID_BAT" as id_bat, "JDATAT" as jdatat, "CCOSEC" as ccosec, "DNUPLA" as dnupla, "CCOPLC" as ccoplc, "DNVOIRI" as dnvoiri, "DINDIC" as dindic, "DVOILIB" as dvoilib, "CCORIV" as ccoriv, "DNUBAT" as dnubat, "DESC" as desc, "DNIV" as dniv, "DPOR" as dpor, "BATI_A00_IDENT_LOCAL"."INVAR" as invar, "CCOEVA" as ccoeva, "CCONLC" as cconlc, "GTAUOM" as gtauom, "CCONAD" as cconad FROM majic."BATI_A00_IDENT_LOCAL" LEFT JOIN majic."BATI_A60_DESCR_DEPEND" ON "BATI_A00_IDENT_LOCAL"."ID_BAT"="BATI_A60_DESCR_DEPEND"."ID_BAT" WHERE "BATI_A00_IDENT_LOCAL"."ID_BAT"=\'$sIdBat\'';
+$aSql['pgsql']['pev'] = 'SELECT  *, "BATI_A21_DESCR_PEV"."ID_PEV" as id_pev, "CCOSTB" as ccostb, "CCOAFF" as ccoaff, "DCAPEC" as dcapec, "DCSGLC" as dcsglc, "BIPEVLA1" as bipevla1,"GNEXPL" as gnexpl, "DVLPERA" as dvlpera, "BATI_A21_DESCR_PEV"."DNUPEV" as dnupev FROM majic."BATI_A21_DESCR_PEV" LEFT JOIN majic."BATI_A36_TAXATION_PEV" ON "BATI_A21_DESCR_PEV"."ID_PEV"="BATI_A36_TAXATION_PEV"."ID_PEV" WHERE "BATI_A21_DESCR_PEV"."ID_PEV"=\'$sIdPev\'';
+$aSql['pgsql']['parcelle']='SELECT *, "ID_PAR" as id_par, "JDATAT" as jdatat, "CCOSEC" as ccosec, "DNUPLA" as dnupla, "DNVOIRI" as dnvoiri, "DINDIC" as dindic, "CCONVO" as cconvo, "DVOILIB" as dvoilib, "CCORIV" as ccoriv, "DPARPI" as dparpi, "GPARNF" as gparnf FROM majic."NON_BATI_A10_DESCR_PARCELLE" WHERE "ID_PAR"=\'$sIdPar\'';
+$aSql['pgsql']['suf']='SELECT *, "ID_SUF" as id_suf, "CCOSTN" as ccostn, "CCOSUB" as ccosub, "DSGRPF" as dsgrpf, "DCLSSF" as dclssf, "CNATSP" as cnatsp, "DCNTSF" as dcntsf, "DRCSUBA" as drcsuba FROM majic."NON_BATI_A21_DESCR_SUF" WHERE "ID_SUF"=\'$sIdSuf\'';
+$aSql['pgsql']['compte_communal']='SELECT *, "PROPRIETAIRE_COURANT"."CCODEP" as ccodep, "PROPRIETAIRE_COURANT"."CCODIR" as ccodir, "FANTOIR_COMMUNE"."CCOCOM" as ccocom, "LIBCOM" as libcom, "DNUPRO" as dnupro, "ID_DNUPRO" as id_dnupro FROM majic."PROPRIETAIRE_COURANT" LEFT JOIN majic."FANTOIR_COMMUNE" ON "PROPRIETAIRE_COURANT"."ID_COM"="FANTOIR_COMMUNE"."ID_COM" WHERE "ID_DNUPRO"=\'$sIdDnupro\'';
+$aSql['pgsql']['exone_pev']='SELECT *, "ID_EX" as id_ex, "CCOLLOC" as ccolloc, "GNEXTL" as gnextl, "JANIMP" as janimp, "JANDEB" as jandeb, "RCEXBA2" as rcexba2 FROM majic."BATI_A30_EXONE_PEV" WHERE "ID_EX"=\'$sIdEx\'';
+$aSql['pgsql']['exon_suf']='SELECT *, "ID_SUF" as id_suf, "RNUEXN" as rnuexn, "CCOLLOC" as ccolloc, "GNEXTS" as gnexts, "JFINEX" as jfinex, "PEXN" as pexn FROM majic."NON_BATI_A30_EXON_SUF" WHERE "ID_SUF"=\'$sIdSuf\' and "RNUEXN"=\'$sRnuexn\'';
+$aSql['pgsql']['lot_local']='SELECT *, "ID_BAT" as id_bat, "KLOT" as klot, "DNUPDL" as dnupdl, "DNULOT" as dnulot, "DNUMQL" as dnumql, "DDENQL" as ddenql FROM majic."LOT_LOCAL" WHERE "ID_BAT"=\'$sIdBat\' and "KLOT"=\'$sKlot\'';
+$aSql['pgsql']['get_id_pev']='SELECT "ID_PEV" as id_pev FROM majic."BATI_A21_DESCR_PEV" WHERE "ID_BAT"=\'$sIdBat\'';
+$aSql['pgsql']['get_id_ex_pev']='SELECT "ID_EX" as id_ex FROM majic."BATI_A30_EXONE_PEV" WHERE "ID_PEV"=\'$sIdPev\'';
+$aSql['pgsql']['get_klot']='SELECT "KLOT" as klot FROM majic."LOT_LOCAL" WHERE "ID_BAT"=\'$sIdBat\'';
+$aSql['pgsql']['get_id_suf']='SELECT "ID_SUF" as id_suf FROM majic."NON_BATI_A21_DESCR_SUF" WHERE "ID_PAR"=\'$sIdPar\'';
+$aSql['pgsql']['get_rnuexn']='SELECT "RNUEXN" as rnuexn FROM majic."NON_BATI_A30_EXON_SUF" WHERE "ID_SUF"=\'$sIdSuf\'';
+$aSql['pgsql']['get_id_pro']='SELECT "ID_PRO" as id_pro FROM majic."PROPRIETAIRE_COURANT" WHERE "ID_DNUPRO"=\'$sIdDnupro\'';
+$aSql['pgsql']['get_id_bat']='SELECT "ID_BAT" as id_bat FROM majic."BATI_A00_IDENT_LOCAL" WHERE "ID_DNUPRO"=\'$sIdDnupro\'';
+$aSql['pgsql']['get_id_par']='SELECT "ID_PAR" as id_par FROM majic."NON_BATI_A10_DESCR_PARCELLE" WHERE "ID_DNUPRO"=\'$sIdDnupro\'';
+
+$aSql['sqlite']['proprietaire']= 'SELECT *, "ID_DNUPRO" as id_dnupro, "ID_PRO" as id_pro, "L_CCODRO" as l_ccodro, "L_CCODEM" as l_ccodem, "DNUPER" as dnuper, "DQUALP" as dqualp, "DDENOM" as ddenom, "DNOMLP" as dnomlp, "DPRNLP" as dprnlp, "EPXNEE" as epxnee, "DNOMCP" as dnomcp, "DPRNCP" as dprncp, "JDATNSS" as jdatnss, "DLDNSS" as dldnss, "DLIGN3" as dlign3, "DLIGN4" as dlign4, "DLIGN5" as dlign5, "DLIGN6" as dlign6 FROM "PROPRIETAIRE_COURANT" LEFT JOIN "tc_CCODRO_code_droit" ON "PROPRIETAIRE_COURANT"."CCODRO"="tc_CCODRO_code_droit"."CCODRO" LEFT JOIN "tc_CCODEM_Nature_demembrement" ON "PROPRIETAIRE_COURANT"."CCODEM"="tc_CCODEM_Nature_demembrement"."CCODEM" WHERE "ID_DNUPRO"=\'$sIdDnupro\' AND "ID_PRO"=\'$sIdPro\'';
+$aSql['sqlite']['bati'] = 'SELECT *, "BATI_A00_IDENT_LOCAL"."ID_BAT" as id_bat, "JDATAT" as jdatat, "CCOSEC" as ccosec, "DNUPLA" as dnupla, "CCOPLC" as ccoplc, "DNVOIRI" as dnvoiri, "DINDIC" as dindic, "DVOILIB" as dvoilib, "CCORIV" as ccoriv, "DNUBAT" as dnubat, "DESC" as desc, "DNIV" as dniv, "DPOR" as dpor, "BATI_A00_IDENT_LOCAL"."INVAR" as invar, "CCOEVA" as ccoeva, "CCONLC" as cconlc, "GTAUOM" as gtauom, "CCONAD" as cconad FROM "BATI_A00_IDENT_LOCAL" LEFT JOIN "BATI_A60_DESCR_DEPEND" ON "BATI_A00_IDENT_LOCAL"."ID_BAT"="BATI_A60_DESCR_DEPEND"."ID_BAT" WHERE "BATI_A00_IDENT_LOCAL"."ID_BAT"=\'$sIdBat\'';
+$aSql['sqlite']['pev'] = 'SELECT  *, "BATI_A21_DESCR_PEV"."ID_PEV" as id_pev, "CCOSTB" as ccostb, "CCOAFF" as ccoaff, "DCAPEC" as dcapec, "DCSGLC" as dcsglc, "BIPEVLA1" as bipevla1,"GNEXPL" as gnexpl, "DVLPERA" as dvlpera, "BATI_A21_DESCR_PEV"."DNUPEV" as dnupev FROM "BATI_A21_DESCR_PEV" LEFT JOIN "BATI_A36_TAXATION_PEV" ON "BATI_A21_DESCR_PEV"."ID_PEV"="BATI_A36_TAXATION_PEV"."ID_PEV" WHERE "BATI_A21_DESCR_PEV"."ID_PEV"=\'$sIdPev\'';
+$aSql['sqlite']['parcelle']='SELECT *, "ID_PAR" as id_par, "JDATAT" as jdatat, "CCOSEC" as ccosec, "DNUPLA" as dnupla, "DNVOIRI" as dnvoiri, "DINDIC" as dindic, "CODEVOIE" as codevoie, "LIBVOIE" as libvoie, "CCORIV" as ccoriv, "DPARPI" as dparpi, "GPARNF" as gparnf FROM "NON_BATI_A10_DESCR_PARCELLE" LEFT JOIN "FANTOIR_VOIE" ON "NON_BATI_A10_DESCR_PARCELLE"."ID_RIVOLI"="FANTOIR_VOIE"."ID_RIVOLI" WHERE "ID_PAR"=\'$sIdPar\'';
+$aSql['sqlite']['suf']='SELECT *, "ID_SUF" as id_suf, "CCOSTN" as ccostn, "CCOSUB" as ccosub, "DSGRPF" as dsgrpf, "DCLSSF" as dclssf, "CNATSP" as cnatsp, "DCNTSF" as dcntsf, "DRCSUBA" as drcsuba FROM "NON_BATI_A21_DESCR_SUF" WHERE "ID_SUF"=\'$sIdSuf\'';
+$aSql['sqlite']['compte_communal']='SELECT *, "PROPRIETAIRE_COURANT"."CCODEP" as ccodep, "PROPRIETAIRE_COURANT"."CCODIR" as ccodir, "FANTOIR_COMMUNE"."CCOCOM" as ccocom, "LIBCOM" as libcom, "DNUPRO" as dnupro, "ID_DNUPRO" as id_dnupro FROM "PROPRIETAIRE_COURANT" LEFT JOIN "FANTOIR_COMMUNE" ON "PROPRIETAIRE_COURANT"."ID_COM"="FANTOIR_COMMUNE"."ID_COM" WHERE "ID_DNUPRO"=\'$sIdDnupro\'';
+$aSql['sqlite']['exone_pev']='SELECT *, "ID_EX" as id_ex, "CCOLLOC" as ccolloc, "GNEXTL" as gnextl, "JANIMP" as janimp, "JANDEB" as jandeb, "RCEXBA2" as rcexba2 FROM "BATI_A30_EXONE_PEV" WHERE "ID_EX"=\'$sIdEx\'';
+$aSql['sqlite']['exon_suf']='SELECT *, "ID_SUF" as id_suf, "RNUEXN" as rnuexn, "CCOLLOC" as ccolloc, "GNEXTS" as gnexts, "JFINEX" as jfinex, "PEXN" as pexn FROM "NON_BATI_A30_EXON_SUF" WHERE "ID_SUF"=\'$sIdSuf\' and "RNUEXN"=\'$sRnuexn\'';
+$aSql['sqlite']['lot_local']='SELECT *, "ID_BAT" as id_bat, "KLOT" as klot, "DNUPDL" as dnupdl, "DNULOT" as dnulot, "DNUMQL" as dnumql, "DDENQL" as ddenql FROM "LOT_LOCAL" WHERE "ID_BAT"=\'$sIdBat\' and "KLOT"=\'$sKlot\'';
+$aSql['sqlite']['get_id_pev']='SELECT "ID_PEV" as id_pev FROM "BATI_A21_DESCR_PEV" WHERE "ID_BAT"=\'$sIdBat\'';
+$aSql['sqlite']['get_id_ex_pev']='SELECT "ID_EX" as id_ex FROM "BATI_A30_EXONE_PEV" WHERE "ID_PEV"=\'$sIdPev\'';
+$aSql['sqlite']['get_klot']='SELECT "KLOT" as klot FROM "LOT_LOCAL" WHERE "ID_BAT"=\'$sIdBat\'';
+$aSql['sqlite']['get_id_suf']='SELECT "ID_SUF" as id_suf FROM "NON_BATI_A21_DESCR_SUF" WHERE "ID_PAR"=\'$sIdPar\'';
+$aSql['sqlite']['get_rnuexn']='SELECT "RNUEXN" as rnuexn FROM "NON_BATI_A30_EXON_SUF" WHERE "ID_SUF"=\'$sIdSuf\'';
+$aSql['sqlite']['get_id_pro']='SELECT "ID_PRO" as id_pro FROM "PROPRIETAIRE_COURANT" WHERE "ID_DNUPRO"=\'$sIdDnupro\'';
+$aSql['sqlite']['get_id_bat']='SELECT "ID_BAT" as id_bat FROM "BATI_A00_IDENT_LOCAL" WHERE "ID_DNUPRO"=\'$sIdDnupro\'';
+$aSql['sqlite']['get_id_par']='SELECT "ID_PAR" as id_par FROM "NON_BATI_A10_DESCR_PARCELLE" WHERE "ID_DNUPRO"=\'$sIdDnupro\'';
+
+?>
\ No newline at end of file
diff --git a/src/module_cadastre/web_service/class/majic_lib/Mj_Attribute.class.inc b/src/module_cadastre/web_service/class/majic_lib/Mj_Attribute.class.inc
new file mode 100755
index 0000000000000000000000000000000000000000..bcc320a7305b0b9131e0e78324ade1ad32a50b68
--- /dev/null
+++ b/src/module_cadastre/web_service/class/majic_lib/Mj_Attribute.class.inc
@@ -0,0 +1,53 @@
+<?php
+/**
+* \file Mj_Attribute.class.inc
+* \brief Mj_Attribute.class.inc \n \n Ce fichier contient la classe php Mj_Attribute
+* 
+* Cette classe permet de s�lectionner les attributs n�cessaires afin de traiter la partie Attribute. 
+*
+* \author Nicolas Chazeau
+* \author Olivier Gayte <olivier.gayte@veremes.com>
+*/
+/**
+* \class Mj_Attribute
+* \brief Mj_Attribute Class \n \n Mj_Attributes est une classe PHP qui h�rite de la classe Mj_Attribute.
+*
+* Cette classe permet de s�lectionner les attributs n�cessaires afin de traiter la partie Attribute. 
+*
+* \author Nicolas Chazeau
+* \author Olivier Gayte <olivier.gayte@veremes.com>
+*/
+require_once ("Mj.class.inc");
+
+class Mj_Attribute extends Mj {
+	/**
+	* Cette m�thode m�tier permet de r�cup�rer l'attribut parmi les attributs d'une emprise calcul�e sur la parcelle d'un compte communal.
+	* \param $aAttributes Tableau.
+	* \param $aField Tableau des libell�s issue des properties.
+	* \private
+	*/
+	function __construct($aAttributes,$aField=Array()){
+		$aAttribute=array();
+		$aAttribute["label"]=$aAttributes["label"];
+		$aAttribute["title"]=$aField[$aAttributes["label"]];
+		$aAttribute["value"]=$aAttributes["value"];
+		$this->aFields=$aAttribute;
+	}
+	/**
+	* Cette m�thode permet de construire un tableau correspondant au relev� de propri�t�.
+	* \return Retourne un tableau associatif correspondant au relev� de propri�t�.
+	*/
+	function getExportFields(){
+		$aExportFields=array();
+		if($this->isEmpty()){
+			$aExportFields="";
+		}else{
+			$aExportFields['label']=$this->aFields["label"];
+			$aExportFields['title']=$this->aFields["title"];
+			$aExportFields['value']=$this->aFields["value"];
+		}
+		return $aExportFields;
+	}
+
+}
+?>
\ No newline at end of file
diff --git a/src/module_cadastre/web_service/class/majic_lib/Mj_Attributes.class.inc b/src/module_cadastre/web_service/class/majic_lib/Mj_Attributes.class.inc
new file mode 100755
index 0000000000000000000000000000000000000000..515604605946549905d8e69833364f377cb83676
--- /dev/null
+++ b/src/module_cadastre/web_service/class/majic_lib/Mj_Attributes.class.inc
@@ -0,0 +1,64 @@
+<?php
+/**
+* \file Mj_Attributes.class.inc
+* \brief Mj_Attributes.class.inc \n \n Ce fichier contient la classe php Mj_Attributes
+* 
+* Cette classe permet de s�lectionner les attributs n�cessaires afin de traiter la partie Attributes d'une Emprise. 
+*
+* \author Nicolas Chazeau
+* \author Olivier Gayte <olivier.gayte@veremes.com>
+*/
+/**
+* \class Mj_Attributes
+* \brief Mj_Attributes Class \n \n Mj_Attributes est une classe PHP qui h�rite de la classe Mj.
+*
+* Cette classe permet de s�lectionner les attributs n�cessaires afin de traiter la partie Attributes d'une Emprise. 
+*
+* \author Nicolas Chazeau
+* \author Olivier Gayte <olivier.gayte@veremes.com>
+*/
+require_once ("Mj.class.inc");
+require_once ("Mj_Attribute.class.inc");
+
+class Mj_Attributes extends Mj {
+	/**
+	* Tableau associatif comportant la liste des objets Attribut d'une Emprise.
+	*/
+	var $aAttributes =array();
+
+	/**
+	* Cette m�thode m�tier permet de r�cup�rer les attributs d'une emprise calcul�e sur la parcelle d'un compte communal.
+	* \param $aAttributesEmprise Tableau des attributs.
+	* \param $aField Tableau des libell�s issue des properties.
+	* \private
+	* \return Un tableau HTML sous la forme d'une cha�ne de caract�res.
+	*/
+	function __construct($aAttributesEmprise,$aField=Array()){
+		foreach ($aAttributesEmprise as $sAttributeEmprise => $aValue){
+			if (is_array($aValue)){
+				foreach ($aValue as $sLabel => $sValue){
+					$aAttribute["label"]=$sLabel;
+					$aAttribute["value"]=$sValue;
+					array_push($this->aAttributes,new Mj_Attribute($aAttribute,$aField));
+				}
+			}
+		}
+		$aTest["test"]="test";
+		$this->aFields=$aTest;
+		$this->aObjects=$this->aAttributes;
+	}
+
+	/**
+	* Cette m�thode permet de construire un tableau.
+	* \return Retourne un tableau associatif.
+	*/
+	function getExportFields(){
+		$aExportFields=array();
+		if($this->isEmpty()){
+			$aExportFields="";
+		}
+		return $aExportFields;
+	}
+
+}
+?>
\ No newline at end of file
diff --git a/src/module_cadastre/web_service/class/majic_lib/Mj_Bati.class.inc b/src/module_cadastre/web_service/class/majic_lib/Mj_Bati.class.inc
new file mode 100755
index 0000000000000000000000000000000000000000..c0efa18e4780a55af3c557c5e2ec29ff8000cc3e
--- /dev/null
+++ b/src/module_cadastre/web_service/class/majic_lib/Mj_Bati.class.inc
@@ -0,0 +1,605 @@
+<?php
+/**
+* \file Mj_Bati.class.inc
+* \brief Mj_Bati.class.inc \n \n Ce fichier contient la classe php Mj_Bati
+* 
+* Cette classe permet de s�lectionner les attributs n�cessaires afin de traiter la partie bati. 
+*
+* \author Damien Bedel
+* \author Olivier Gayte <olivier.gayte@veremes.com>
+*/
+/**
+* \class Mj_Bati
+* \brief Mj_Bati Class \n \n Mj_Bati est une classe PHP qui h�rite de la classe Mj.
+*
+* Cette classe permet de s�lectionner les attributs n�cessaires afin de traiter la partie b�ti. 
+*
+* \author Damien Bedel
+* \author Olivier Gayte <olivier.gayte@veremes.com>
+*/
+require_once ("Mj.class.inc");
+require_once ("Mj_Pev.class.inc");
+require_once ("Mj_Lot_Local.class.inc");
+
+class Mj_Bati extends Mj {
+	/**
+	* Tableau associatif comportant la liste des objets Pev du b�ti
+	*/
+	var $aPev=array();
+	/**
+	* Tableau associatif comportant la liste des objets Lot_Local du b�ti
+	*/
+	var $aLotLocal=array();
+
+	/**
+	* \param $sIdBat Identifiant de b�ti
+	* \param $oBD Objet de connexion PDO_BD
+	*/
+	function __construct($sIdBat,$oBD, $sEncryptedKey=''){
+		$this->sEncryptKey = $sEncryptedKey;
+		include $this->sRessourcesFile;
+		$this->sSql=$aSql[$oBD->sgbd]['bati'];
+		$this->sSql=str_replace('$sIdBat', $sIdBat, $this->sSql);
+		$oPDOresult= $oBD->execute($this->sSql);
+		if ($oBD->enErreur()) {
+			$this->sStatus=1;
+			$this->sMessage=$oBD->getBDMessage();
+		}else{
+			$this->aFields=$oBD->ligneSuivante($oPDOresult);
+			$this->sStatus=0;
+		}
+		$this->aPev=$this->get_aPev($oBD);
+		$this->aPro=$this->get_aPro($oBD);
+		$this->aLotLocal=$this->get_aLot_Local($oBD);
+		$this->aObjects=array_merge ($this->aPev, $this->aLotLocal, $this->aPro);
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer les ID_PRO en fonction d'un ID_DNUPRO donn�.
+	* \return Retourne un tableau de ID_PRO.
+	*/
+	function get_aId_Pro($oBD){
+		if($this->isEmpty()){
+			$aIdPro="";
+		}else{
+			include $this->sRessourcesFile;
+			$aIdPro=array();
+			$this->sSql=$aSql[$oBD->sgbd]['get_id_pro'];
+			$this->sSql=str_replace('$sIdDnupro', $this->encrypt($this->aFields['b_iddnupro']), $this->sSql);
+			$oPDOresult= $oBD->execute($this->sSql);
+			if ( $oBD->enErreur()) {
+				$this->sStatus=1;
+				$this->sMessage=$oBD->getBDMessage();
+			}else{
+				while($aResultFetch=$oBD->tableauSuivant ($oPDOresult)){
+					array_push($aIdPro,$aResultFetch[0]);
+					$this->sStatus=0;
+				}
+			}
+		}
+		return $aIdPro;
+		$oPDOresult=$oBD->fermeResultat();
+	}	
+	/**
+	* Cette m�thode permet de r�cup�rer la liste des objets Proprietaire
+	* \return Retourne un tableau d'objets Proprietaire
+	*/
+	function get_aPro($oBD){
+		$aPro=array();
+		if($this->isEmpty()){
+			$aPro="";
+		}else{
+			$aIdPro=$this->get_aId_Pro($oBD);
+			foreach($aIdPro as $sIdPro){
+				array_push($aPro,new Mj_Proprietaire($this->aFields['b_iddnupro'],$sIdPro,$oBD, $this->sEncryptKey));
+			}
+		}
+		return $aPro;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer les Id_Pev en fonction d'un Id_Bat donn�.
+	* \return Retourne un tableau de cha�nes de caract�res.
+	*/
+	function get_aId_Pev($oBD){
+		if($this->isEmpty()){
+			$aIdPev="";
+		}else{
+			include $this->sRessourcesFile;
+			$aIdPev=array();
+			$this->sSql=$aSql[$oBD->sgbd]['get_id_pev'];
+			$this->sSql=str_replace('$sIdBat', $this->aFields['id_bat'], $this->sSql);
+			$oPDOresult=$oBD->execute($this->sSql);
+			if ($oBD->enErreur()){
+				$this->sStatus=1;
+				$this->sMessage=$oBD->getBDMessage();
+			}else{
+				while($aResultFetch=$oBD->tableauSuivant ($oPDOresult)){
+					array_push($aIdPev,$aResultFetch[0]);
+					$this->sStatus=0;
+				}
+			}
+		}
+		return $aIdPev;
+	}	
+	/**
+	* Cette m�thode permet de r�cup�rer la liste des objets Pev du b�ti
+	* \return Retourne un tableau d'objets Pev
+	*/
+	function get_aPev($oBD){
+		$aPev=array();
+		if($this->isEmpty()){
+			$aPev="";
+		}else{
+		  $aIdPev=$this->get_aId_Pev($oBD);
+			foreach($aIdPev as $sValue){
+				array_push($aPev,new Mj_Pev($sValue,$oBD));
+			}
+		}
+		return $aPev;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer les Klot en fonction d'un Id_Bat donn�
+	* \return Retourne un tableau de cha�nes de caract�res
+	*/
+	function get_aKlot($oBD){
+		if($this->isEmpty()){
+			$aKlot="";
+		}else{
+			include $this->sRessourcesFile;
+			$aKlot=array();
+			$this->sSql=$aSql[$oBD->sgbd]['get_klot'];
+			$this->sSql=str_replace('$sIdBat', $this->aFields['id_bat'], $this->sSql);
+			$oPDOresult=$oBD->execute($this->sSql);
+			if ( $oBD->enErreur()) {
+				$this->sStatus=1;
+				$this->sMessage=$oBD->getBDMessage();   	
+			}else{
+				while($aResultFetch=$oBD->tableauSuivant ($oPDOresult)){
+					array_push($aKlot,$aResultFetch[0]);
+					$this->sStatus=0;
+				}
+			}
+		}
+		return $aKlot;
+	}	
+	/**
+	* Cette m�thode permet de r�cup�rer la liste des objets Lot-Local du b�ti
+	* \return Retourne un tableau d'objets Lot-Local
+	*/
+	function get_aLot_Local($oBD){
+		$aLotLocal=array();
+		if($this->isEmpty()){
+			$aLotLocal="";
+		}else{
+			$aKlot=$this->get_aKlot($oBD);
+			foreach($aKlot as $sKlot){
+				array_push($aLotLocal,new Mj_Lot_Local($this->aFields['id_bat'],$sKlot,$oBD));
+			}
+		}
+		return $aLotLocal;	
+	}
+	
+	/**
+	* Cette m�thode permet de construire un tableau correspondant au relev� de propri�t�.
+	* \return Retourne un tableau associatif correspondant au relev� de propri�t�.
+	*/
+	function getExportFields(){
+		$aExportFields=array();
+		if($this->isEmpty()){
+			$aExportFields="";
+		}else{
+			$aExportFields['date']=$this->getJdatat();
+			$aExportFields['section']=$this->aFields['ccosec'];
+			$aExportFields['num_plan']=$this->aFields['dnupla'];
+			$aExportFields['cp']=$this->aFields['ccoplc'];
+			$aExportFields['voirie']=$this->getVoirie();
+			$aExportFields['adresse']=$this->aFields['dvoilib'];
+			$aExportFields['code_rivoli']=$this->aFields['ccoriv'];
+			$aExportFields['bat']=$this->aFields['dnubat'];
+			$aExportFields['ent']=$this->aFields['desc'];
+			$aExportFields['niv']=$this->aFields['dniv'];
+			$aExportFields['num_de_porte']=$this->aFields['dpor'];
+			$aExportFields['num_invar']=$this->getNumeroInvar();
+			$aExportFields['m_eva']=$this->aFields['ccoeva'];
+			$aExportFields['nat_loc']=$this->getNatLoc();
+			$aExportFields['tx_om']=$this->aFields['gtauom'];
+			$aExportFields['s_tar']=$this->getSTar();
+			$aExportFields['af']=$this->getAf();
+			$aExportFields['cat']=$this->getCat();
+			$aExportFields['revenu_cadastral']=$this->getRevenuCadastral();
+			$aExportFields['revenu_cadastral_txt']=$this->setFloatToText($this->getRevenuCadastral());
+			$aExportFields['dvlpera']=$this->aFields['dvlpera'];
+			$aExportFields['b_dnupro']=$this->aFields['b_dnupro'];
+			$aExportFields['b_iddnupro']=$this->aFields['b_iddnupro'];
+			$aExportFields['dteloc']=$this->aFields['dteloc'];
+			$aExportFields['dvltrt']=$this->aFields['dvltrt'];
+			$aExportFields['dnumql']=$this->aFields['dnumql'];
+			$aExportFields['ddenql']=$this->aFields['ddenql'];
+			//$aExportFields['nat_exo']=$this->getNatExo();
+			//$aExportFields['exoneration']=$this->getExoneration();
+			//$aExportFields['revenu_cadastral_avec_exo']=$this->getRevenuCadastralAvecExo();
+			//$aExportFields['revenu_cadastral_avec_pp']=$this->getRevenuCadastralAvecPP();
+			$aExportFields['num_invar']=$this->aFields['invar'];
+			$aExportFields['ddenql']=$this->aFields['ddenql'];
+			$aExportFields['local_type']=$this->aFields['dteloc'];
+			$aExportFields['nature']=$this->aFields['cconlc'];
+			$aExportFields['lib_nature']=$this->aFields['lib_cconlc'];
+			$aExportFields['occupation']=$this->aFields['dnatlc'];
+			$aExportFields['lib_occupation']=$this->getOccupation();
+			$aExportFields['date_mut']=$this->getJdatat_full();
+			$aExportFields['annee_constr']=$this->aFields['jannat'];
+			$aExportFields['niveaux']=$this->aFields['dnbniv'];
+			$aExportFields['libcom']=$this->aFields['libcom'];
+		}
+		return $aExportFields;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer les deux derniers caract�res de l'attribut Jdatat et d'y ajouter 1.
+	* \return Retourne une cha�ne de caract�res.
+	*/
+	function getJdatat_full(){
+		$sjdatat=$this->aFields['jdatat'];
+		if ($sjdatat != ""){
+			if (preg_match( '`^\d{1,2}/\d{1,2}/\d{4}$`' , $sjdatat ) ){
+				$sNewJdatat_full=$sjdatat;
+			}else if (preg_match( '`^\d{1,2}/\d{1,2}/\d{2}$`' , $sjdatat ) ){
+				$sNewJdatat_full=$sjdatat;
+			}else{
+				$sNewJdatat_full=substr($sjdatat,0,2)."/".substr($sjdatat,2,2)."/".substr($sjdatat,4,4);
+			}
+		}
+		return $sNewJdatat_full;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer les deux derniers caract�res de l'attribut Jdatat et d'y ajouter 1.
+	* \return Retourne une cha�ne de caract�res.
+	*/
+	function getJdatat(){
+		$sNewJdatat=$this->aFields['jdatat'];
+		if (preg_match( '`^\d{1,2}/\d{1,2}/\d{4}$`' , $sNewJdatat ) ){			
+			$sNewJdatat=substr("$sNewJdatat", 6, 4)+1;
+			$sNewJdatat=(string)(substr("$sNewJdatat", 2, 2));
+		}else if (preg_match( '`^\d{1,2}/\d{1,2}/\d{2}$`' , $sNewJdatat ) ){
+			$sNewJdatat=(string) (substr("$sNewJdatat", 6, 2)+1);
+			if(strlen($sNewJdatat) == 1){
+				$sNewJdatat='0'.$sNewJdatat;
+			}
+			$sNewJdatat=(string) (substr("$sNewJdatat", -2, 2));
+		}else{
+			$sNewJdatat=substr("$sNewJdatat", 4, 4)+1;
+			$sNewJdatat=(string)(substr("$sNewJdatat", 2, 2));
+		}
+		return $sNewJdatat;
+	}
+	/**
+	* Cette m�thode permet de supprimer le code commune de l'attribut invar.
+	* \return Retourne une cha�ne de caract�res.
+	*/
+	function getNumeroInvar(){
+		$sNumeroInvar=$this->aFields['invar'];
+		$sNumeroInvar= substr("$sNumeroInvar", 3, 7);
+		return $sNumeroInvar;
+	}
+	/**
+	* Cette m�thode permet de concat�ner les attributs dnvoiri et indic.
+	* \return Retourne une cha�ne de caract�res.
+	*/
+	function getVoirie(){
+		$sVoirie=ltrim($this->aFields['dnvoiri'],'0').$this->aFields['dindic'];
+		return $sVoirie;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer la valeur de l'attribut 's_tar' dans le tableau aPev.
+	* \return Retourne une cha�ne de caract�res.
+	*/
+	function getSTar(){
+		if(count($this->aPev)==1){
+			return $this->aPev[0]->aFields['ccostb'];
+		}else{
+			return '';
+		}
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer la valeur de l'attribut 'af' dans le tableau aPev.
+	* \return Retourne une cha�ne de caract�res.
+	*/
+	function getAf(){
+		if(count($this->aPev)==1){
+			return $this->aPev[0]->aFields['ccoaff'];
+		}else{
+			return '';
+		}
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer la valeur de l'attribut 'cat' dans le tableau aPev.
+	* \return Retourne une cha�ne de caract�res.
+	*/
+	function getCat(){
+		if(count($this->aPev)==1){
+			return $this->aPev[0]->aFields['dcapec'];
+		}else{
+			return '';
+		}
+	}
+	/**
+	* Cette m�tode permet de r�cup�rer la somme du revenu cadastral pour un b�ti avec exon�ration de type EP, CD, CR, DR ou NI.
+	* \return Retourne un entier.
+	*/
+	/*function getRevenuCadastralAvecExo(){
+		$iRevenuCadastralAvecExo=0;
+		foreach ($this->aPev as $oPev) {
+			if(ereg ("EP|CD|CR|DR|NI|ND", $oPev->aExportFields['nat_exo'])){
+				$iRevenuCadastralAvecExo=$iRevenuCadastralAvecExo + $oPev->aExportFields['revenu_cadastral'];
+			}
+		} 
+		return $iRevenuCadastralAvecExo;
+	}*/
+	/**
+	* Cette m�tode permet de r�cup�rer la somme du revenu cadastral pour un b�ti avec exon�ration de type PP.
+	* \return Retourne un entier.
+	*/
+	/*function getRevenuCadastralAvecPP(){
+		$iRevenuCadastralAvecPP=0;
+		foreach ($this->aPev as $oPev) {
+			if((ereg ("PP", $oPev->aExportFields['nat_exo'])) && ((int) ($this->aFields['dnupev']>1))){
+				$iRevenuCadastralAvecPP=$iRevenuCadastralAvecPP + $oPev->aExportFields['revenu_cadastral'];
+			}
+		} 
+		return $iRevenuCadastralAvecPP;
+	}
+	/**
+	* Cette m�tode permet de r�cup�rer la somme du revenu cadastral pour un b�ti.
+	* \return Retourne un entier.
+	*/
+	function getRevenuCadastral(){
+		$iRevenuCadastral=0;
+		foreach($this->aPev as $oPev){
+			$iRevenuCadastral=$iRevenuCadastral+ (int) $oPev->getRevenuCadastral();
+		}
+		return $iRevenuCadastral;
+	}
+	/**
+	* Cette m�tode permet de r�cup�rer la somme du revenu cadastral pour un b�ti.
+	* \return Retourne un float.
+	*/
+	function getRevenuCadastralfloat(){
+		$iRevenuCadastral=0;
+		foreach($this->aPev as $oPev){
+			$fRevenuCadastral=$fRevenuCadastral+ (float) $oPev->getRevenuCadastral();
+		}
+		return $fRevenuCadastral;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer la somme des exon�rations pour un b�ti.
+	* \return Retourne un entier.
+	*/
+	function getExoneration($sLccodem){
+		$iExoneration=0;
+		foreach ($this->aPev as $oPev){
+			if (($sLccodem!='') && (ereg ("PP", $oPev->getNatExo())) && ((int) ($this->aFields['dnupev']>1))){
+				$iExoneration=$iExoneration + $oPev->getRevenuCadastral();
+			}elseif($oPev->getNatExo()!=''){
+				$iExoneration=$iExoneration + $oPev->getRevenuCadastral();
+			}
+		} 
+		return $iExoneration;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer la somme des exon�rations pour un b�ti.
+	* \return Retourne un float.
+	*/
+	function getExonerationfloat($sLccodem){
+		$fExoneration=0;
+		foreach ($this->aPev as $oPev){
+			if (($sLccodem!='') && (ereg ("PP", $oPev->getNatExo())) && ((int) ($this->aFields['dnupev']>1))){
+				$fExoneration=$fExoneration + $oPev->getRevenuCadastralfloat();
+			}elseif($oPev->getNatExo()!=''){
+				$fExoneration=$fExoneration + $oPev->getRevenuCadastralfloat();
+			}
+		} 
+		return $fExoneration;
+	}
+	/**
+	* Cette m�thode permet de retourner la nature du local.
+	* \return Retourne une cha�ne de caract�res qui peut �tre valide (la cha�ne de caract�res a �t� v�rifi�e d'apr�s des exemples de relev�s de propri�t�) ou non valide (la cha�ne de caract�res n'a pas pu �tre v�rifi�e).
+	*/
+	function getNatLoc(){
+		switch($this->aFields["cconlc"]){
+			case 'MA' :
+				$sNatLoc="MAIS"; // Cas valid�
+			break;
+			case 'AP' :
+				$sNatLoc="APP"; // Cas valid�
+			break;
+			case 'DE' :
+				$sNatLoc=$this->getNatureDep(); // Cf fonction getNatureDep()
+			break;
+			case 'DC' :
+				$sNatLoc="DLC"; // cas non valid�
+			break;
+			case 'LC' :
+				$sNatLoc="L.COM"; // Cas valid�
+			break;
+			case 'CM' :
+				$sNatLoc="CM"; // Cas valid�
+			break;
+			case 'CA' :
+				$sNatLoc="CA"; // Cas valid�
+			break;
+			case 'CD' :
+				$sNatLoc="DEP.C"; // Cas valid�
+			break;
+			case 'CB' :
+				$sNatLoc="L.DIV"; // Cas valid�
+			break;
+			case 'ME' :
+				$sNatLoc="M.EXC"; // Cas valid�
+			break;
+			case 'MP' :
+				$sNatLoc="M.PAR"; // Cas valid�
+			break;
+			case 'SM' :
+				$sNatLoc="SOLM"; // Cas non valid�
+			break;
+			case 'AU' :
+				$sNatLoc="AU"; // Cas valid�
+			break;
+			case 'CH' :
+				$sNatLoc="CHANT"; // Cas valid�
+			break;
+			case 'U ' :
+				$sNatLoc="E.IND"; // Cas valid�
+			break;
+			case 'US' :
+				$sNatLoc="US"; // Cas valid�
+			break;
+			case 'UG' :
+				$sNatLoc="AGAZ"; // Cas non valid�
+			break;
+			case 'UE' :
+				$sNatLoc="UE"; // Cas valid�
+			break;
+			case 'U1' :
+				$sNatLoc="GARE"; // Cas non valid�
+			break;
+			case 'U2' :
+				$sNatLoc="GTRI"; // Cas non valid�
+			break;
+			case 'U3' :
+				$sNatLoc="GAMAT"; // Cas non valid�
+			break;
+			case 'U4' :
+				$sNatLoc="GAMAG"; // Cas non valid�
+			break;
+			case 'U5' :
+				$sNatLoc="GDETI"; // Cas non valid�
+			break;
+			case 'U6' :
+				$sNatLoc="GDERE"; // Cas non valid�
+			break;
+			case 'U7' :
+				$sNatLoc="GMATR"; // Cas non valid�
+			break;
+			case 'U8' :
+				$sNatLoc="GEMR"; // Cas non valid�
+			break;
+			case 'U9' :
+				$sNatLoc="GSTUS"; // Cas non valid�
+			break;
+			case 'AT' :
+				$sNatLoc="AT"; // Cas valid�
+			break;
+			default :
+				$sNatLoc=substr($this->aFields["cconlc"],0,4);
+			break;
+		}
+		return $sNatLoc;
+	}
+	/**
+	* Cette m�thode permet de retourner la nature de d�pendance.
+	* \return Retourne une cha�ne de caract�res qui peut �tre valide (la cha�ne de caract�res a �t� v�rifi�e d'apr�s des exemples de relev�s de propri�t�) ou non valide (la cha�ne de caract�res n'a pas pu �tre v�rifi�e).
+	*/
+	function getNatureDep(){
+		switch($this->aFields["cconad"]){
+			case 'GA' :
+				$sNatureDep="GAR"; // Cas valid�
+			break;
+			case 'CV' :
+				$sNatureDep="CAVE"; // Cas valid�
+			break;
+			case 'GR' :
+				$sNatureDep="GREN"; // Cas valid�
+			break;
+			case 'TR' :
+				$sNatureDep="TERR"; // Cas non valid�
+			break;
+			case 'GP' :
+				$sNatureDep="GPARK"; // Cas valid�
+			break;
+			case 'GC' :
+				$sNatureDep="GRCA"; // Cas non valid�
+			break;
+			case 'BX' :
+				$sNatureDep="BOX"; // Cas valid�
+			break;
+			case 'PK' :
+				$sNatureDep="PARK"; // Cas valid�
+			break;
+			case 'CL' :
+				$sNatureDep="CELL"; // Cas non valid�
+			break;
+			case 'BD' :
+				$sNatureDep="BUAN"; // Cas non valid�
+			break;
+			case 'BC' :
+				$sNatureDep="BUCH"; // Cas non valid�
+			break;
+			case 'RS' :
+				$sNatureDep="REMI"; // Cas non valid�
+			break;
+			case 'TT' :
+				$sNatureDep="TT"; // Cas valid�
+			break;
+			case 'PI' :
+				$sNatureDep="P.IND"; // Cas valid�
+			break;
+			case 'PA' :
+				$sNatureDep="AGREM"; // Cas valid�
+			break;
+			case 'CD' :
+				$sNatureDep="CHDO"; // Cas non valid�
+			break;
+			case 'DC' :
+				$sNatureDep="DEP.C"; // Cas valid�
+			break;
+			case 'JH' :
+				$sNatureDep="J.HIV"; // Cas valid�
+			break;
+			case 'PS' :
+				$sNatureDep="PISC"; // Cas valid�
+			break;
+			case 'SR' :
+				$sNatureDep="SERR"; // Cas non valid�
+			break;
+			default :
+				$sNatureDep=substr($this->aFields["cconad"],0,4);
+			break;
+		}
+		return $sNatureDep;
+	}
+	/**
+	* Cette m�thode permet de formater un d�cimal pour l'affichage.
+	* \return Retourne une chaine
+	*/
+	function setFloatToText($fFloat){
+		return number_format($fFloat,2,'.','');
+	}
+	/**
+	* Cette m�thode permet de retourner l'occupation du logement
+	* \return Retourne une cha�ne de caract�res qui peut �tre valide (la cha�ne de caract�res a �t� v�rifi�e d'apr�s des exemples de relev�s de propri�t�) ou non valide (la cha�ne de caract�res n'a pas pu �tre v�rifi�e).
+	*/
+	function getOccupation(){
+		switch($this->aFields["dnatlc"]){
+			case 'P' :
+				$sOccupation="Proprietaire ou  Usufruitier";
+			break;
+			case 'L' :
+				$sOccupation="Location autre que propri�taire ou usufruitier";
+			break;
+			case 'V' :
+				$sOccupation="Vacant";
+			break;
+			case 'T' :
+				$sOccupation="Location, non affect�e � l�habitation, soumise � TVA";
+			break;
+			case 'D' :
+				$sOccupation="Habitation principale occup�e par le propri�taire";
+			break;
+			default :
+				$sOccupation=substr($this->aFields["dnatlc"],0,1);
+			break;
+		}
+		return $sOccupation;
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/src/module_cadastre/web_service/class/majic_lib/Mj_Bati_Parcelle.class.inc b/src/module_cadastre/web_service/class/majic_lib/Mj_Bati_Parcelle.class.inc
new file mode 100755
index 0000000000000000000000000000000000000000..f499117c779f28e0337f42e9af3cc54cfd6945eb
--- /dev/null
+++ b/src/module_cadastre/web_service/class/majic_lib/Mj_Bati_Parcelle.class.inc
@@ -0,0 +1,162 @@
+<?php
+/**
+* \file Mj_Bati_Parcelle.class.inc
+* \brief Mj_Bati_Parcelle.class.inc \n \n Ce fichier contient la classe php Mj_Bati_Parcelle
+*
+* Cette classe permet de s�lectionner les attributs n�cessaires afin de traiter les batis associ�s � une parcelle.
+*
+* \author Damien Bedel
+* \author Olivier Gayte <olivier.gayte@veremes.com>
+* \author Fabien Marty <fabien.marty@veremes.com>
+*/
+
+require_once ("Mj.class.inc");
+require_once ("Mj_Bati.class.inc");
+require_once ("Mj_Proprietaire.class.inc");
+
+class Mj_Bati_Parcelle extends Mj {
+	/**
+	* Tableau associatif comportant la liste des objets Bati de la parcelle.
+	*/
+	var $aBat=array();
+	/**
+	* Chaine qui stocke l'anne� de r�f�rence des donn�es  casdatrales.
+	*/
+	var $sAnneeReference;
+
+	/**
+	* \param $sIdPar Identifiant de la parcelle
+	* \param $oBD Objet de connexion
+	*/
+	function __construct($sIdPar,$oBD){
+		include $this->sRessourcesFile;
+		$this->sSql=$aSql[$oBD->sgbd]['bati_parcelle'];
+		$this->sSql=str_replace('sIdPar',$sIdPar,$this->sSql);
+		$oPDOresult=$oBD->execute($this->sSql);
+		if($oBD->enErreur()){
+			$this->sStatus=1;
+			$this->sMessage=$oBD->getBDMessage();
+		}else{
+			$this->sStatus=0;
+			$this->aFields=$oBD->ligneSuivante ($oPDOresult);
+		}
+		$oPDOresult=$oBD->fermeResultat();
+		$this->aBat=$this->get_aBat($oBD,$sIdPar);
+		$this->sSql=$aSql[$oBD->sgbd]['annee_reference'];
+		$oPDOresult=$oBD->execute($this->sSql);
+		if ($oBD->erreurRencontree != 0){
+			$this->sStatus=1;
+			$this->sMessage=$oBD->getBDMessage();
+		}else{
+			$aAnneeReference=$oBD->ligneSuivante ($oPDOresult);
+			$this->sAnneeReference=$aAnneeReference['ANNEE'];
+		}
+  		$this->aObjects=$this->aBat;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer les ID_BAT en fonction d'un ID_PAR donn�
+	* \param $oBD Objet de connexion
+	* \param $sIdPar Chaine identifiant de la parcelle
+	* \return Retourne un tableau de ID_BAT
+	*/
+	function get_aId_Bat($oBD,$sIdPar){
+		if($this->isEmpty()){
+			$aIdBat="";
+		}else{
+			include $this->sRessourcesFile;
+			$aIdBat=array();
+			$this->sSql=$aSql[$oBD->sgbd]['get_par_id_bat'];
+			$this->sSql=str_replace('sIdPar',$sIdPar,$this->sSql);
+			$oPDOresult=$oBD->execute($this->sSql);
+			if($oBD->enErreur()){
+				$this->sStatus=1;
+				$this->sMessage=$oBD->getBDMessage();
+			}else{
+				while($aResultFetch=$oBD->tableauSuivant ($oPDOresult)){
+					array_push($aIdBat,$aResultFetch[0]);
+					$this->sStatus=0;
+				}
+			}
+		}
+		return $aIdBat;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer la liste des objets BATI
+	* \param $oBD Objet de connexion
+	* \param $sIdPar Chaine identifiant de la parcelle
+	* \return Retourne un tableau d'objets BATI
+	*/
+	function get_aBat($oBD,$sIdPar){
+		$aBat=array();
+		if($this->isEmpty()){
+			$aBat="";
+		}else{
+			$aIdBat=$this->get_aId_Bat($oBD,$sIdPar);
+			foreach($aIdBat as $sIdBat){
+				array_push($aBat,new Mj_Bati($sIdBat,$oBD));
+			}
+		}
+		return $aBat;
+	}
+	/**
+	* Cette m�thode permet de construire un tableau correspondant au relev� de propri�t�.
+	* \return Retourne un tableau associatif correspondant au relev� de propri�t�.
+	*/
+	function getExportFields(){
+		$aExportFields=array();
+		if($this->isEmpty()){
+			$aExportFields="";
+		}else{
+			$aExportFields['id_par']=$this->aFields['id_par'];
+			$aExportFields['annee_de_maj']=$this->sAnneeReference;
+			$aExportFields['dep_dir']=$this->getDepdir();
+			$aExportFields['code_dep']=$this->aFields['ccodep'];
+			$aExportFields['code_com']=$this->aFields['ccocom'];
+			$aExportFields['lib_dep']=$this->aFields['libdep'];
+			$aExportFields['com']=$this->getCom();
+			$aExportFields['libcom']=$this->aFields['libcom'];
+			$aExportFields['role']="";
+			$aExportFields['vue']="";
+			$aExportFields['contenance']=$this->aFields['dcntpa'];
+			$aExportFields['adresse']=$this->getAdresseParcelle();
+			$aExportFields['total_valeur_locative']=$this->getValeurLocativeBati();
+		}
+		return $aExportFields;
+	}
+	/**
+	* Cette m�thode permet de concat�ner les attributs ccodep et ccodir.
+	* /return Retourne une cha�ne de caract�res correspondant au DEP DIR du RP.
+	*/
+	function getDepdir(){
+		$sDepdir=$this->aFields['ccodep']." ".$this->aFields['ccodir'];
+		return $sDepdir;
+	}
+	/**
+	* Cette m�thode permet de concat�ner les attributs ccocom et libcom.
+	* /return Retourne une cha�ne de carcat�res correspondant au COM du RP.
+	*/
+	function getCom(){
+		$sCom=$this->aFields['ccocom']." ".$this->aFields['libcom'];
+		return $sCom;
+	}
+	/**
+	* Cette m�thode permet de concat�ner les attributs cconvo et dvoilib.
+	* \return Retourne une cha�ne de caract�res.
+	*/
+	function getAdresseParcelle(){
+		$sAdresseParcelle=ltrim(rtrim($this->aFields['dnvoiri']),'0').rtrim($this->aFields['dindic'])." ".rtrim($this->aFields['cconvo'])." ".rtrim($this->aFields['dvoilib']);
+		return $sAdresseParcelle;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer la valeur locative totale du b�ti.
+	* \return Retourne un double
+	*/
+	function getValeurLocativeBati(){
+		$iValeurLocativeBati=0;
+		foreach($this->aBat as $oBat){
+			$iValeurLocativeBati=$oBat->aFields['dvlpera']+$iValeurLocativeBati;
+		}
+		return $iValeurLocativeBati;
+	}
+}
+?>
\ No newline at end of file
diff --git a/src/module_cadastre/web_service/class/majic_lib/Mj_Bati_Parcelles.class.inc b/src/module_cadastre/web_service/class/majic_lib/Mj_Bati_Parcelles.class.inc
new file mode 100755
index 0000000000000000000000000000000000000000..32b418b90305423dfcc51b6cde1eab1d70048da9
--- /dev/null
+++ b/src/module_cadastre/web_service/class/majic_lib/Mj_Bati_Parcelles.class.inc
@@ -0,0 +1,61 @@
+<?php
+/**
+* \file Mj_Bati_Parcelles.class.inc
+* \brief Mj_Bati_Parcelles.class.inc \n \n Ce fichier contient la classe php Mj_Bati_Parcelles
+*
+* Cette classe permet de s�lectionner les attributs n�cessaires afin de traiter les batis associ�s � une parcelle.
+*
+* \author Olivier Gayte <olivier.gayte@veremes.com>
+* \author Fabien Marty <fabien.marty@veremes.com>
+*/
+
+require_once ("Mj.class.inc");
+require_once ("Mj_Bati_Parcelle.class.inc");
+
+class Mj_Bati_Parcelles extends Mj {
+
+	/**
+	* \param $aIdPar Identifiant de la parcelle
+	* \param $oBD Objet de connexion
+	*/
+	function __construct($aIdPar,$oBD){
+		$i=0;
+		while ($aIdPar[$i]){
+			array_push ($this->aObjects, new Mj_Bati_Parcelle($aIdPar[$i],$oBD));
+			$i++;
+		}
+	}
+	/**
+	* \brief Cette m�thode permet de construire un tableau.
+	* \return Retourne un tableau associatif.
+	*/
+	function getExportFields(){
+		$aExportFields=array();
+		$aExportFields['sum_contenance_m2']=$this->getSurfaceCadastraleM2();
+		$aExportFields['sum_valeur_locative']=$this->getValeurLocative();
+		return $aExportFields;
+	}
+	/**
+	* \brief R�cup�ration de la surface totale des parcelles en mettre carr�.
+	*/
+	function getSurfaceCadastraleM2(){
+		$dSurfaceCadastraleM2=0;
+		foreach($this->getObjects('Mj_Bati_Parcelle') as $oBatiPar){
+			$aFields=$oBatiPar->getExportFields();
+			$dSurfaceCadastraleM2=((int) $aFields['contenance'])+$dSurfaceCadastraleM2;
+		}
+		return $dSurfaceCadastraleM2;
+	}
+	/**
+	* \brief R�cup�ration des valeurs locatives
+	*/
+	function getValeurLocative(){
+		$dValeurLocative=0;
+		foreach($this->getObjects('Mj_Bati_Parcelle') as $oBatiPar) {
+			$aFields=$oBatiPar->getExportFields();
+			$dValeurLocative=$aFields['total_valeur_locative']+$dValeurLocative;
+		}
+		return $dValeurLocative;
+	}
+}
+?>
\ No newline at end of file
diff --git a/src/module_cadastre/web_service/class/majic_lib/Mj_Compte_Communal.class.inc b/src/module_cadastre/web_service/class/majic_lib/Mj_Compte_Communal.class.inc
new file mode 100755
index 0000000000000000000000000000000000000000..bb39be23bd1147ecd93facf2b672256b27414f9e
--- /dev/null
+++ b/src/module_cadastre/web_service/class/majic_lib/Mj_Compte_Communal.class.inc
@@ -0,0 +1,727 @@
+<?php
+/**
+* \file Mj_Compte_Communal.class.inc
+* \brief Mj_Compte_Communal.class.inc \n \n Ce fichier contient la classe php Mj_Compte_Communal
+* 
+* Cette classe permet de s�lectionner les attributs n�cessaires afin de traiter la partie compte communal.
+*
+* \author Damien Bedel 
+* \author Olivier Gayte <olivier.gayte@veremes.com>
+*/
+
+require_once ("Mj.class.inc");
+require_once ("Mj_Proprietaire.class.inc");
+require_once ("Mj_Bati.class.inc");
+require_once ("Mj_Parcelle.class.inc");
+
+class Mj_Compte_Communal extends Mj {
+	/**
+	* Tableau associatif comportant la liste des objets Proprietaire d'un compte communal.
+	*/
+	var $aPro=array();
+	/**
+	* Tableau associatif comportant la liste des objets Bati d'un compte communal.
+	*/
+	var $aBat=array();
+	/**
+	* Tableau associatif comportant la liste des objets Non Bati d'un compte communal.
+	*/
+	var $aPar=array();
+	/**
+	* Chaine qui stocke l'anne� de r�f�rence des donn�es  casdatrales.
+	*/
+	var $sAnneeReference;
+
+	/**
+	* \param $sIdDnupro Identifiant national de compte communal
+	* \param $oBD Objet de connexion PDO_BD
+	*/
+	function __construct($sIdDnupro,$oBD, $sEncryptKey = ''){
+		$this->sEncryptKey = $sEncryptKey;
+		include $this->sRessourcesFile;
+		$this->sSql=$aSql[$oBD->sgbd]['compte_communal'];
+		$this->sSql=str_replace('$sIdDnupro',$this->encrypt($sIdDnupro),$this->sSql);
+		$oPDOresult=$oBD->execute ($this->sSql);
+		if($oBD->enErreur()){
+			$this->sStatus=1;
+			$this->sMessage=$oBD->getBDMessage();
+		}else{
+			$this->sStatus=0;
+			$this->aFields=$oBD->ligneSuivante ($oPDOresult);
+			$this->aFields['id_dnupro'] = $sIdDnupro;
+		}
+		$oPDOresult = $oBD->fermeResultat();
+		$this->aPro = $this->get_aPro($oBD);
+		$this->aBat = $this->get_aBat($oBD);
+		$this->aPar = $this->get_aPar($oBD);
+		$this->sSql = $aSql[$oBD->sgbd]['annee_reference'];
+		$oPDOresult = $oBD->execute ($this->sSql);
+		if ( $oBD->erreurRencontree != 0){
+			$this->sStatus=1;
+			$this->sMessage = $oBD->getBDMessage();
+		}else{
+			$aAnneeReference = $oBD->ligneSuivante ($oPDOresult);
+			$this->sAnneeReference=$aAnneeReference['ANNEE'];
+		}
+  		$this->aObjects = array_merge ($this->aPro, $this->aBat,$this->aPar);
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer les ID_PRO en fonction d'un ID_DNUPRO donn�.
+	* \return Retourne un tableau de ID_PRO.
+	*/
+	function get_aId_Pro($oBD){
+		if($this->isEmpty()){
+			$aIdPro="";
+		}else{
+			include $this->sRessourcesFile;
+			$aIdPro=array();
+			$this->sSql = $aSql[$oBD->sgbd]['get_id_pro'];
+			$this->sSql = str_replace('$sIdDnupro', $this->encrypt($this->aFields['id_dnupro']), $this->sSql);
+			
+			$oPDOresult= $oBD->execute($this->sSql);
+			if ( $oBD->enErreur()) {
+				$this->sStatus=1;
+				$this->sMessage = $oBD->getBDMessage();
+			}else{
+				while($aResultFetch = $oBD->tableauSuivant ($oPDOresult)){
+					array_push($aIdPro,$aResultFetch[0]);
+					$this->sStatus=0;
+				}
+			}
+		}
+		return $aIdPro;
+		$oPDOresult=$oBD->fermeResultat();
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer la liste des objets Proprietaire
+	* \param $oBD Objet de connexion PDO_BD
+	* \return Retourne un tableau d'objets Proprietaire
+	*/
+	function get_aPro($oBD){
+		$aPro=array();
+		if($this->isEmpty()){
+			$aPro="";
+		}else{
+			$aIdPro = $this->get_aId_Pro($oBD);
+
+			foreach($aIdPro as $sIdPro){
+				array_push($aPro,new Mj_Proprietaire($this->aFields['id_dnupro'],$sIdPro,$oBD, $this->sEncryptKey));
+			}
+		}
+		return $aPro;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer les ID_BAT en fonction d'un ID_DNUPRO donn�
+	* \param $oBD Objet de connexion PDO_BD
+	* \return Retourne un tableau de ID_BAT
+	*/
+	function get_aId_Bat($oBD){
+		if($this->isEmpty()){
+			$aIdBat="";
+		}else{
+			include $this->sRessourcesFile;
+			$aIdBat=array();
+			$this->sSql = $aSql[$oBD->sgbd]['get_id_bat'];
+			$this->sSql = str_replace('$sIdDnupro', $this->aFields['id_dnupro'], $this->sSql);
+			$oPDOresult= $oBD->execute($this->sSql);
+			if ( $oBD->enErreur()) {
+				$this->sStatus=1;
+				$this->sMessage=$oBD->getBDMessage();
+			}else{
+				while($aResultFetch = $oBD->tableauSuivant ($oPDOresult)){
+					array_push($aIdBat,$aResultFetch[0]);
+					$this->sStatus=0;
+				}
+			}
+		}
+		return $aIdBat;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer la liste des objets BATI
+	* \param $oBD Objet de connexion PDO_BD
+	* \return Retourne un tableau d'objets BATI
+	*/
+	function get_aBat($oBD){
+		$aBat=array();
+		if($this->isEmpty()){
+			$aBat="";
+		}else{
+			$aIdBat = $this->get_aId_Bat($oBD);
+			foreach($aIdBat as $sIdBat){
+				array_push($aBat,new Mj_Bati($sIdBat,$oBD, $this->sEncryptKey));
+			}
+		}
+		return $aBat;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer les ID_PAR en fonction d'un ID_DNUPRO donn�
+	* \param $oBD Objet de connexion PDO_BD
+	* \return Retourne un tableau de ID_PAR
+	*/
+	function get_aId_Par($oBD){
+		if($this->isEmpty()){
+			$aIdPar="";
+		}else{
+			include $this->sRessourcesFile;
+			$aIdPar=array();
+			$this->sSql=$aSql[$oBD->sgbd]['get_id_par'];
+			$this->sSql=str_replace('sDnupro', $this->aFields['dnupro'], $this->sSql);
+			$this->sSql=str_replace('sIdCom', $this->aFields['ccodep'].$this->aFields['ccodir'].$this->aFields['ccocom'], $this->sSql);
+			//$this->sSql=str_replace('$sIdDnupro', $this->aFields['id_dnupro'], $this->sSql);
+			$oPDOresult=$oBD->execute($this->sSql);
+			if ($oBD->enErreur()){
+				$this->sStatus=1;
+				$this->sMessage=$oBD->getBDMessage();
+			}else{
+				while($aResultFetch=$oBD->tableauSuivant ($oPDOresult)){
+					array_push($aIdPar,$aResultFetch[0]);
+					$this->sStatus=0;
+				}
+			}
+			$this->sSql=$aSql[$oBD->sgbd]['get_id_par_bnd'];
+			$this->sSql=str_replace('sIdDnupro', $this->aFields['id_dnupro'], $this->sSql);
+			$this->sSql=str_replace('sDnupro', substr($this->aFields['id_dnupro'], 6), $this->sSql);
+			$this->sSql=str_replace('sIdCom', $this->aFields['ccodep'].$this->aFields['ccodir'].$this->aFields['ccocom'], $this->sSql);
+			//$this->sSql=str_replace('$sIdDnupro', $this->aFields['id_dnupro'], $this->sSql);
+			$oPDOresult=$oBD->execute($this->sSql);
+			if ($oBD->enErreur()){
+				$this->sStatus=1;
+				$this->sMessage=$oBD->getBDMessage();
+			}else{
+				while($aResultFetch=$oBD->tableauSuivant ($oPDOresult)){
+					array_push($aIdPar,$aResultFetch[0]);
+					
+					$this->sStatus=0;
+				}
+			}
+			$this->aExportFields=$this->getExportFields();
+		}
+		return $aIdPar;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer la liste des objets PARCELLE
+	* \param $oBD Objet de connexion PDO_BD
+	* \return Retourne un tableau d'objets PARCELLE
+	*/
+	function get_aPar($oBD){
+		$aPar=array();
+		if($this->isEmpty()){
+			$aPar="";
+		}else{
+			$aIdPar=$this->get_aId_Par($oBD);
+			foreach($aIdPar as $sIdPar){
+				array_push($aPar,new Mj_Parcelle($oBD,$sIdPar,$this->aFields['id_dnupro']));
+			}
+		}
+		return $aPar;
+	}
+	/**
+	* Cette m�thode permet de construire un tableau correspondant au relev� de propri�t�.
+	* \return Retourne un tableau associatif correspondant au relev� de propri�t�.
+	*/
+	function getExportFields(){
+		$aExportFields=array();
+		if($this->isEmpty()){
+			$aExportFields="";
+		}else{
+			$aExportFields['codeinsee']=$this->aFields['codeinsee'];
+			$aExportFields['annee_de_maj']=$this->sAnneeReference;
+			$aExportFields['dep_dir']=$this->getDepdir();
+			$aExportFields['code_dep']=$this->aFields['ccodep'];
+			$aExportFields['code_com']=$this->aFields['ccocom'];
+			$aExportFields['lib_dep']=$this->aFields['libdep'];
+			$aExportFields['com']=$this->getCom();
+			$aExportFields['libcom']=$this->aFields['libcom'];
+			$aExportFields['role']="";
+			$aExportFields['vue']="";
+			$aExportFields['numero_communal']=$this->aFields['dnupro'];
+			$aExportFields['rev_impo_bati']=$this->getRevImpoBati();
+			$aExportFields['rev_impo_par']=$this->getRevImpoPar();
+			$iContenance = 0;
+			foreach($this->aPar as $oPar){
+				$iContenance = $iContenance + $oPar->getContenance();
+			}
+			$aExportFields['total_contenance']=$this->getTotalContenance();
+			$aExportFields['total_contenance_m2']=$this->getTotalContenanceM2();
+			$aExportFields['total_revenu_cadastral']=$this->getRevenuCadastralTotal();
+			$aExportFields['total_valeur_locative']=$this->getValeurLocativeBati();
+			$aExportFields['emprise_totale_intersect']=$this->getTotalContenanceBati();
+			$aExportFields['ha']=intval($iContenance/10000);
+			if ($aExportFields['ha']==0) {
+				$aExportFields['ha']=' ';
+			}
+
+			$aExportFields['a']=intval(($iContenance%10000)/100);
+			$sContenanceA=$aExportFields['a'];
+			$sContenanceA= strval($sContenanceA);
+			$sTlenA=strlen($sContenanceA);
+			if ($aExportFields['ha']==' ' and $aExportFields['a']==0){
+				$aExportFields['a']=' ';
+			} else {
+				if ($aExportFields['ha'] == ' ' and $sTlenA == 2 and substr($aExportFields['a'],0,1)== 0) {
+					$sDeuxiemeValeur = substr($aExportFields['a'],1,1);
+					$aExportFields['a'] = ' '.$sDeuxiemeValeur;
+				} else {
+					if ($aExportFields['ha'] != ' ' and $sTlenA == 1) {
+						$aExportFields['a']= '0'.$aExportFields['a'];
+					}
+				}
+			}
+			$aExportFields['ca']=$iContenance%100;
+			$sContenanceCa=$aExportFields['ca'];
+			$sContenanceCa= strval($sContenanceCa);
+			$sTlen=strlen($sContenanceCa);
+			if ($aExportFields['a'] != 0)
+				if ($sTlen == 1) {
+					$aExportFields['ca']= '0'.$aExportFields['ca'];
+				}
+			$aExportFields['exo_com_bati']=$this->getExoComBati();
+			$aExportFields['rev_impo_com_bati']=$this->getRevImpoComBati();
+			$aExportFields['exo_dep_bati']=$this->getExoDepBati();
+			$aExportFields['rev_impo_dep_bati']=$this->getRevImpoDepBati();
+			$aExportFields['exo_reg_bati']=$this->getExoRegBati();
+			$aExportFields['rev_impo_reg_bati']=$this->getRevImpoRegBati();
+			$aExportFields['exo_com_par']=$this->getExoComPar();
+			$aExportFields['rev_impo_com_par']=$this->getRevImpoComPar();
+			//$aExportFields['exo_dep_reg_par']=$this->getExoDepRegPar();
+			//$aExportFields['rev_impo_dep_reg_par']=$this->getRevImpoDepRegPar();
+			$aExportFields['exo_dep_par']=$this->getExoDepPar();
+			$aExportFields['rev_impo_dep_par']=$this->getRevImpoDepPar();
+			$aExportFields['exo_reg_par']=$this->getExoRegPar();
+			$aExportFields['rev_impo_reg_par']=$this->getRevImpoRegPar();
+			//modif float
+			$aExportFields['rev_impo_bati_float']=$this->getRevImpoBatifloat();
+			$aExportFields['rev_impo_par_float']=$this->getRevImpoParfloat();
+			$aExportFields['exo_com_bati_float']=$this->getExoComBatifloat();
+			$aExportFields['rev_impo_com_bati_float']=$this->getRevImpoComBatifloat();
+			$aExportFields['exo_dep_bati_float']=$this->getExoDepBatifloat();
+			$aExportFields['rev_impo_dep_bati_float']=$this->getRevImpoDepBatifloat();
+			$aExportFields['exo_reg_bati_float']=$this->getExoRegBatifloat();
+			$aExportFields['rev_impo_reg_bati_float']=$this->getRevImpoRegBatifloat();
+			$aExportFields['exo_com_par_float']=$this->getExoComParfloat();
+			$aExportFields['rev_impo_com_par_float']=$this->getRevImpoComParfloat();
+			//$aExportFields['exo_dep_reg_par_float']=$this->getExoDepRegParfloat();
+			//$aExportFields['rev_impo_dep_reg_par_float']=$this->getRevImpoDepRegParfloat();
+			$aExportFields['exo_dep_par_float']=$this->getExoDepParfloat();
+			$aExportFields['rev_impo_dep_par_float']=$this->getRevImpoDepParfloat();
+			$aExportFields['exo_reg_par_float']=$this->getExoRegParfloat();
+			$aExportFields['rev_impo_reg_par_float']=$this->getRevImpoRegParfloat();
+			$aExportFields['exo_tax_ad_par_float']=$this->getExoTaxeADParfloat();
+			$aExportFields['rev_impo_tax_ad_par_float']=$this->getRevImpoTaxeADParfloat();
+			$aExportFields['exo_tax_ad_par']=$this->getExoTaxeADPar();
+			$aExportFields['rev_impo_tax_ad_par']=$this->getRevImpoTaxeADPar();
+		}
+		return $aExportFields;
+	}
+	/**
+	* Cette m�thode permet de concat�ner les attributs ccodep et ccodir.
+	* /return Retourne une cha�ne de caract�res correspondant au DEP DIR du RP.
+	*/
+	function getDepdir(){
+		$sDepdir = $this->aFields['ccodep']." ".$this->aFields['ccodir'];
+		return $sDepdir;
+	}
+	/**
+	* Cette m�thode permet de concat�ner les attributs ccocom et libcom.
+	* /return Retourne une cha�ne de carcat�res correspondant au COM du RP.
+	*/
+	function getCom(){
+		$sCom = $this->aFields['ccocom']." ".$this->aFields['libcom'];
+		return $sCom;
+	}
+	/**
+	* Cette m�thode permet de calculer le revenu imposable total du b�ti.
+	* \return Retourne un entier.
+	*/
+	function getRevImpoBati(){
+		$iRevImpoBati=0;
+		foreach($this->aBat as $oBat){
+			$iRevImpoBati=$iRevImpoBati+ (int) $oBat->getRevenuCadastral();;
+		}
+		return $iRevImpoBati;
+	}
+	/**
+	* Cette m�thode permet de calculer le revenu imposable total du b�ti.
+	* \return Retourne un float.
+	*/
+	function getRevImpoBatifloat(){
+		$fRevImpoBati=0;
+		foreach($this->aBat as $oBat){
+			$fRevImpoBati=$fRevImpoBati+ (float) $oBat->getRevenuCadastralfloat();;			
+		}
+		return $fRevImpoBati;
+	}
+	/**
+	* Cette m�thode permet de calculer l'exon�ration communale totale du b�ti.
+	* \return Retourne un entier
+	*/
+	function getExoComBati(){
+		$iExoComBati=0;
+		foreach($this->aBat as $oBat){
+			$iExoComBati=$iExoComBati + $oBat->getExoneration($oPro->aFields['l_ccodem']);
+		}
+		return $iExoComBati;
+	}
+	/**
+	* Cette m�thode permet de calculer l'exon�ration communale totale du b�ti.
+	* \return Retourne un float
+	*/
+	function getExoComBatifloat(){
+		$fExoComBati=0;
+		foreach($this->aBat as $oBat){
+			$fExoComBati=$fExoComBati + $oBat->getExonerationfloat($oPro->aFields['l_ccodem']);
+		}
+		return $fExoComBati;
+	}
+	/**
+	* Cette m�thode permet de calculer le revenu imposable communal du b�ti en fonction du revenu imposable total (b�ti) et de l'exon�ration communale totale (b�ti).
+	* \return Retourne un entier.
+	*/
+	function getRevImpoComBati(){
+		$iRevImpoComBati=$this->getRevImpoBati()-$this->getExoComBati($oPro->aFields['l_ccodem']);
+		return $iRevImpoComBati;
+	}
+	/**
+	* Cette m�thode permet de calculer le revenu imposable communal du b�ti en fonction du revenu imposable total (b�ti) et de l'exon�ration communale totale (b�ti).
+	* \return Retourne un float.
+	*/
+	function getRevImpoComBatifloat(){
+		$fRevImpoComBati=$this->getRevImpoBatifloat()-$this->getExoComBatifloat($oPro->aFields['l_ccodem']);
+		return $fRevImpoComBati;
+	}
+	/**
+	* Cette m�thode permet de calculer l'exon�ration d�partementale totale du b�ti.
+	* \return Retourne un entier
+	*/
+	function getExoDepBati(){
+		$iExoDepBati=0;
+		foreach($this->aBat as $oBat){
+			$iExoDepBati=$iExoDepBati + $oBat->getExoneration($oPro->aFields['l_ccodem']);
+		}
+		return $iExoDepBati;
+	}
+	/**
+	* Cette m�thode permet de calculer l'exon�ration d�partementale totale du b�ti.
+	* \return Retourne un float
+	*/
+	function getExoDepBatifloat(){
+		$fExoDepBati=0;
+		foreach($this->aBat as $oBat){
+			$fExoDepBati=$fExoDepBati + $oBat->getExonerationfloat($oPro->aFields['l_ccodem']);
+		}
+		return $fExoDepBati;
+	}
+	/**
+	* Cette m�thode permet de calculer le revenu imposable d�partemental du b�ti en fonction du revenu imposable total (b�ti) et de l'exon�ration d�partemantale totale (b�ti).
+	* \return Retourne un entier.
+	*/
+	function getRevImpoDepBati(){
+		$iRevImpoDepBati=$this->getRevImpoBati()-$this->getExoDepBati();
+		return $iRevImpoDepBati;
+	}
+	/**
+	* Cette m�thode permet de calculer le revenu imposable d�partemental du b�ti en fonction du revenu imposable total (b�ti) et de l'exon�ration d�partemantale totale (b�ti).
+	* \return Retourne un float.
+	*/
+	function getRevImpoDepBatifloat(){
+		$fRevImpoDepBati=$this->getRevImpoBatifloat()-$this->getExoDepBatifloat();
+		return $fRevImpoDepBati;
+	}
+	/**
+	* Cette m�thode permet de calculer l'exon�ration r�gionale totale du b�ti.
+	* \return Retourne un entier
+	*/
+	function getExoRegBati(){
+		$iExoRegBati=0;
+		foreach($this->aBat as $oBat){
+			$iExoRegBati=$iExoRegBati + $oBat->getExoneration($oPro->aFields['l_ccodem']);
+		}
+		return $iExoRegBati;
+	}
+	/**
+	* Cette m�thode permet de calculer l'exon�ration r�gionale totale du b�ti.
+	* \return Retourne un float
+	*/
+	function getExoRegBatifloat(){
+		$fExoRegBati=0;
+		foreach($this->aBat as $oBat){
+			$fExoRegBati=$fExoRegBati + $oBat->getExonerationfloat($oPro->aFields['l_ccodem']);
+		}
+		return $fExoRegBati;
+	}
+	/**
+	* Cette m�thode permet de calculer le revenu imposable r�gional du b�ti en fonction du revenu imposable total (b�ti) et de l'exon�ration r�gionale totale (b�ti).
+	* \return Retourne un entier.
+	*/
+	function getRevImpoRegBati(){
+		$iRevImpoRegBati=$this->getRevImpoBati()-$this->getExoRegBati();
+		return $iRevImpoRegBati;
+	}
+	/**
+	* Cette m�thode permet de calculer le revenu imposable r�gional du b�ti en fonction du revenu imposable total (b�ti) et de l'exon�ration r�gionale totale (b�ti).
+	* \return Retourne un float.
+	*/
+	function getRevImpoRegBatifloat(){
+		$fRevImpoRegBati=$this->getRevImpoBatifloat()-$this->getExoRegBatifloat();
+		return $fRevImpoRegBati;
+	}
+	/**
+	* Cette m�thode permet de calculer l'emprise b�tie totale des parcelles.
+	* \return Retourne un entier.
+	*/
+	function getTotalContenanceBati(){
+		$iContenance = 0;
+		foreach($this->aPar as $oPar){
+			foreach($oPar->aIntersect as $oIntersect){
+				$iContenanceBati = $iContenanceBati + $oIntersect->getEmpriseTotale();
+			}
+		}
+		return $iContenanceBati;
+	}
+	/**
+	* Cette m�thode permet de calculer le revenu imposable total des parcelles.
+	* \return Retourne un entier.
+	*/
+	function getRevImpoPar(){
+		$fRevImpoPar=0;
+		foreach($this->aPar as $oPar){
+			$fRevImpoPar=$fRevImpoPar+ (float) $oPar->getRevenuCadastral();
+			$iRevImpoPar=round($fRevImpoPar);
+		}
+		return $iRevImpoPar;
+	}
+	/**
+	* Cette m�thode permet de calculer le revenu imposable total des parcelles.
+	* \return Retourne un float.
+	*/
+	function getRevImpoParfloat(){
+		$fRevImpoPar=0;
+		foreach($this->aPar as $oPar){
+			$fRevImpoPar=$fRevImpoPar+ (float) $oPar->getRevenuCadastral();
+		}
+		return $fRevImpoPar;
+	}
+	/** DEPRECATED
+	/**
+	* Cette m�thode permet de calculer l'exon�ration (d�partementale et r�gionale) totale des parcelles.
+	* \return Retourne un entier
+	*/
+	/*
+	function getExoDepRegPar(){
+		$fExoDepRegPar=0;
+		foreach($this->aPar as $oPar){
+			$fExoDepRegPar=$fExoDepRegPar + $oPar->getRevenuCadastralAvecExo();
+		}
+		$iExoDepRegPar = round($fExoDepRegPar);
+		return $iExoDepRegPar;
+	}
+	*/
+	/**
+	* Cette m�thode permet de calculer le revenu imposable (d�partemental et r�gional) des parcelles en fonction du revenu imposable total (parcelles) et de l'exon�ration (d�partementale et r�gionale) totale (parcelles).
+	* \return Retourne un entier.
+	*/
+	/*
+	function getRevImpoDepRegPar(){
+		$iRevImpoDepRegPar=$this->getRevImpoPar()-$this->getExoDepRegPar();
+		return $iRevImpoDepRegPar;
+	}
+	*/
+	/**
+	* Cette m�thode permet de calculer l'exon�ration d�partementale totale des parcelles.
+	* \return Retourne un entier
+	*/
+	function getExoDepPar(){
+		$fExoDepPar=0;
+		foreach($this->aPar as $oPar){
+			$fExoDepPar=$fExoDepPar + $oPar->getRevenuCadastralDepAvecExo();
+		}
+		$iExoDepPar = round($fExoDepPar);
+		return $iExoDepPar;
+	}
+	/**
+	* Cette m�thode permet de calculer l'exon�ration d�partementale totale des parcelles.
+	* \return Retourne un float
+	*/
+	function getExoDepParfloat(){
+		$fExoDepPar=0;
+		foreach($this->aPar as $oPar){
+			$fExoDepPar=$fExoDepPar+$oPar->getRevenuCadastralDepAvecExo();
+		}
+		return $fExoDepPar;
+	}
+	/**
+	* Cette m�thode permet de calculer le revenu imposable d�partemental des parcelles en fonction du revenu imposable total (parcelles) et de l'exon�ration (d�partementale et r�gionale) totale (parcelles).
+	* \return Retourne un entier.
+	*/
+	function getRevImpoDepPar(){
+		$iRevImpoDepPar=$this->getRevImpoPar()-$this->getExoDepPar();
+		return $iRevImpoDepPar;
+	}
+	/**
+	* Cette m�thode permet de calculer le revenu imposable d�partemental des parcelles en fonction du revenu imposable total (parcelles) et de l'exon�ration (d�partementale et r�gionale) totale (parcelles).
+	* \return Retourne un float.
+	*/
+	function getRevImpoDepParfloat(){
+		$fRevImpoDepPar=$this->getRevImpoParfloat()-$this->getExoDepParfloat();
+		return $fRevImpoDepPar;
+	}
+	/**
+	* Cette m�thode permet de calculer l'exon�ration r�gionale totale des parcelles.
+	* \return Retourne un entier
+	*/
+	function getExoRegPar(){
+		$fExoRegPar=0;
+		foreach($this->aPar as $oPar){
+			$fExoRegPar=$fExoRegPar + $oPar->getRevenuCadastralRegAvecExo();
+		}
+		$iExoRegPar = round($fExoRegPar);
+		return $iExoRegPar;
+	}
+	/**
+	* Cette m�thode permet de calculer l'exon�ration r�gionale totale des parcelles.
+	* \return Retourne un float
+	*/
+	function getExoRegParfloat(){
+		$fExoRegPar=0;
+		foreach($this->aPar as $oPar){
+			$fExoRegPar=$fExoRegPar + $oPar->getRevenuCadastralRegAvecExo();
+		}
+		return $fExoRegPar;
+	}
+	/**
+	* Cette m�thode permet de calculer le revenu imposable r�gional des parcelles en fonction du revenu imposable total (parcelles) et de l'exon�ration (d�partementale et r�gionale) totale (parcelles).
+	* \return Retourne un entier.
+	*/
+	function getRevImpoRegPar(){
+		$iRevImpoRegPar=$this->getRevImpoPar()-$this->getExoRegPar();
+		return $iRevImpoRegPar;
+	}
+	/**
+	* Cette m�thode permet de calculer le revenu imposable r�gional des parcelles en fonction du revenu imposable total (parcelles) et de l'exon�ration (d�partementale et r�gionale) totale (parcelles).
+	* \return Retourne un float.
+	*/
+	function getRevImpoRegParfloat(){
+		$fRevImpoRegPar=$this->getRevImpoParfloat()-$this->getExoRegParfloat();
+		return $fRevImpoRegPar;
+	}
+	/**
+	* Cette m�thode permet de calculer la contenance totale des parcelles.
+	* \return Retourne un entier.
+	*/
+	function getTotalContenance(){
+		$iContenance = 0;
+		foreach($this->aPar as $oPar){
+			$iContenance = $iContenance + $oPar->aFields['dcntpa'];
+		}
+		return $iContenance;
+	}
+	/**
+	* Cette m�thode permet de calculer la contenance totale des parcelles en mettre carr�. 
+	* \return Retourne un entier.
+	*/
+	function getTotalContenanceM2(){
+		$iContenanceM2=0;
+		foreach($this->aPar as $oPar){
+			$iContenanceM2 = $iContenanceM2 + $oPar->getContenance();
+		}
+		return $iContenanceM2;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer le revenu cadastral total des parcelles.
+	* \return Retourne un double
+	*/
+	function getRevenuCadastralTotal(){
+		$dRevCadastralTotal=0;
+		foreach($this->aPar as $oPar){
+			$dRevCadastralTotal=$dRevCadastralTotal + $oPar->getRevenuCadastral();
+		}
+		//$iRevCadastralTotal = round($dRevCadastralTotal);
+		return $dRevCadastralTotal;
+	}
+	/**
+	* Cette m�thode permet de calculer l'�xon�ration communale totale des parcelles.
+	* \return Retourne 0;
+	*/
+	function getExoComPar(){
+		$iExoComPar=0;
+		foreach($this->aPar as $oPar){
+			$fExoComPar=$fExoComPar + $oPar->getRevenuCadastralComAvecExo();
+		}
+		$iExoComPar = round($fExoComPar);
+		return $iExoComPar;
+	}
+	/**
+	* Cette m�thode permet de calculer l'�xon�ration communale totale des parcelles.
+	* \return Retourne 0;
+	*/
+	function getExoComParfloat(){
+		$fExoComPar=0;
+		foreach($this->aPar as $oPar){
+			$fExoComPar=$fExoComPar + $oPar->getRevenuCadastralComAvecExo();
+		}
+		return $fExoComPar;
+	}
+	/**
+	* Cette m�thode permet de calculer le revenu imposable communal des parcelles en fonction du revenu imposable total (parcelles) et de l'exon�ration communale totale (parcelles).
+	* \return Retourne un entier.
+	*/
+	function getRevImpoComPar(){
+		$iRevImpoComPar=$this->getRevImpoPar()-$this->getExoComPar();
+		return $iRevImpoComPar;
+	}
+	/**
+	* Cette m�thode permet de calculer le revenu imposable communal des parcelles en fonction du revenu imposable total (parcelles) et de l'exon�ration communale totale (parcelles).
+	* \return Retourne un float.
+	*/
+	function getRevImpoComParfloat(){
+		$fRevImpoComPar=$this->getRevImpoParfloat()-$this->getExoComParfloat();
+		return $fRevImpoComPar;
+	}
+	function getExoTaxeADPar(){
+		$iExoTaxeAdPar=0;
+		foreach($this->aPar as $oPar){
+			$fExoTaxeADPar=$fExoTaxeADPar + $oPar->getRevenuCadastralTaxeADAvecExo();
+		}
+		$iExoTaxeADPar = round($fExoTaxeADPar);
+		return $iExoTaxeADPar;
+	}
+	/**
+	* Cette m�thode permet de calculer l'�xon�ration des taxes additionnelles totale des parcelles.
+	* \return Retourne 0;
+	*/
+	function getExoTaxeADParfloat(){
+		$fExoTaxeADPar=0;
+		foreach($this->aPar as $oPar){
+			$fExoTaxeADPar=$fExoTaxeADPar + $oPar->getRevenuCadastralTaxeADAvecExo();
+		}
+		return $fExoTaxeADPar;
+	}
+	/**
+	* Cette m�thode permet de calculer le revenu imposable des taxes additionnelles des parcelles en fonction du revenu imposable total (parcelles) et de l'exon�ration communale totale (parcelles).
+	* \return Retourne un entier.
+	*/
+	function getRevImpoTaxeAdPar(){
+		$iRevImpoTaxeADPar=$this->getRevImpoPar()-$this->getExoTaxeADPar();
+		return $iRevImpoTaxeADPar;
+	}
+	/**
+	* Cette m�thode permet de calculer le revenu imposable des taxes additionnelles des parcelles en fonction du revenu imposable total (parcelles) et de l'exon�ration communale totale (parcelles).
+	* \return Retourne un float.
+	*/
+	function getRevImpoTaxeADParfloat(){
+		$fRevImpoTaxeADPar=$this->getRevImpoParfloat()-$this->getExoTaxeADParfloat();
+		return $fRevImpoTaxeADPar;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer la valeur locative totale du b�ti.
+	* \return Retourne un double
+	*/
+	function getValeurLocativeBati(){
+		$iValeurLocativeBati=0;
+		foreach($this->aBat as $oBat){
+			$iValeurLocativeBati= $oBat->aFields['dvlpera'] + $iValeurLocativeBati;
+		}
+		return $iValeurLocativeBati;
+	}
+}
+?>
\ No newline at end of file
diff --git a/src/module_cadastre/web_service/class/majic_lib/Mj_Compte_Communal_Parcelle.class.inc b/src/module_cadastre/web_service/class/majic_lib/Mj_Compte_Communal_Parcelle.class.inc
new file mode 100755
index 0000000000000000000000000000000000000000..d78f88fe044ec4bbc9bba4bc9564d0b25390587e
--- /dev/null
+++ b/src/module_cadastre/web_service/class/majic_lib/Mj_Compte_Communal_Parcelle.class.inc
@@ -0,0 +1,145 @@
+<?php
+/**
+* \file Mj_Compte_Communal_Parcelle.class.inc
+* \brief Mj_Compte_Communal_Parcelle.class.inc \n \n Ce fichier contient la classe php Mj_Compte_Communal_Parcelle
+*
+* Cette classe permet de s�lectionner les attributs n�cessaires afin de traiter un relev� de propri�t� en fonction d'un compte communal et d'un num�ro de parcelle.
+*
+* \author Damien Bedel
+* \author Olivier Gayte <olivier.gayte@veremes.com>
+*/
+require_once ("Mj_Compte_Communal.class.inc");
+
+class Mj_Compte_Communal_Parcelle extends Mj_Compte_Communal {
+	/**
+	* Identifiant national de la parcelle sur 15 caract�res.
+	*/
+	var $sIdPar;
+	/**
+	* Bool�en servant � savoir si on recherche une parcelle avec tout les batiments
+	*/
+	var $bFP=false;
+
+	/**
+	* \param $sIdDnupro peut etre vide, un identifiant sera d�fini par une requete sql sur l'identifiant parcelle
+	* \param $sIdPar Identifiant de la parcelle.
+	* \param $oBD Objet de connexion PDO_BD
+	*/
+	function __construct($sIdDnupro,$sIdPar,$oBD,$bFP=false,$sEncryptedKey='',$AllSuf=false){
+		$this->bAllSuf=$AllSuf;
+		$this->sEncryptKey=$sEncryptedKey;
+		include $this->sRessourcesFile;
+		if($sIdDnupro==""){
+			$sSql=$aSql[$oBD->sgbd]['get_id_dnupro'];
+			$sSql=str_replace('idparpro', $sIdPar, $sSql);
+			$oPDOresult=$oBD->execute($sSql);
+			$aIdDnuProSql=$oBD->ligneSuivante ($oPDOresult);
+			$sIdDnupro=$aIdDnuProSql['iddnupro'];
+			$sDnupro=$aIdDnuProSql['dnupro'];
+			$oPDOresult=$oBD->fermeResultat();
+		}
+		$this->sSql=$aSql[$oBD->sgbd]['compte_communal_parcelle'];
+		$this->sSql=str_replace('$sIdDnupro', $this->encrypt($sIdDnupro), $this->sSql);
+		$this->sSql=str_replace('$sIdPar', $sIdPar, $this->sSql);
+		$oPDOresult= $oBD->execute($this->sSql);
+		if($oBD->enErreur()){
+			$this->sStatus=1;
+			$this->sMessage=$oBD->getBDMessage();
+		}else{
+			if($aCompteCom=$oBD->ligneSuivante($oPDOresult)){
+				$this->aFields=$aCompteCom;
+				$this->aFields['id_dnupro']=$sIdDnupro;
+				//$this->aFields['dnupro']=$sIdDnupro;
+				$this->sStatus=0;
+				$oPDOresult=$oBD->fermeResultat();
+				$this->aPro=$this->get_aPro($oBD);
+				$this->aBat=$this->get_aBat($oBD,$bFP);
+				$this->aPar=$this->get_aPar($oBD,$sIdPar,$sIdDnupro);
+				// r�cup�ration de l'ann�e de r�f�rence
+				$this->sSql=$aSql[$oBD->sgbd]['annee_reference'];
+				$oPDOresult=$oBD->execute($this->sSql);
+				if($oBD->enErreur()){
+					$this->sStatus=1;
+					$this->sMessage=$oBD->getBDMessage();
+				}else{
+					$aAnneeReference=$oBD->ligneSuivante ($oPDOresult);
+					$this->sAnneeReference=$aAnneeReference['ANNEE'];
+				}
+				$oPDOresult=$oBD->fermeResultat();
+				$this->aObjects=array_merge ($this->aPro,$this->aBat,$this->aPar);
+			}else{
+				$this->sStatus=1;
+				$this->sMessage="Aucun compte communal trouv� pour la parcelle : ".$sIdPar;
+				$oPDOresult=$oBD->fermeResultat();
+			}
+		}
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer les ID_BAT en fonction d'un ID_DNUPRO donn�
+	* \return Retourne un tableau de ID_BAT
+	*/
+	function get_aId_Bat($sIdPar, $oBD, $bFP){
+		if($this->isEmpty()){
+			$aIdBat="";
+		}else{
+			include $this->sRessourcesFile;
+			$aIdBat=array();
+			if (!$bFP){
+				$this->sSql=$aSql[$oBD->sgbd]['get_id_bat_parcelle'];
+				$this->sSql=str_replace('$sIdDnupro', $this->aFields['id_dnupro'], $this->sSql);
+				$this->sSql=str_replace('$sIdPar', $this->aFields['id_par'], $this->sSql);
+			}else{
+				$this->sSql=$aSql[$oBD->sgbd]['get_par_id_bat'];
+				$this->sSql=str_replace('sIdPar', $this->aFields['id_par'], $this->sSql);
+			}
+			$oPDOresult= $oBD->execute($this->sSql);
+			if($oBD->enErreur()){
+				$this->sStatus=1;
+				$this->sMessage=$oBD->getBDMessage();
+			}else{
+				while($aResultFetch = $oBD->tableauSuivant ($oPDOresult)){
+					array_push($aIdBat,$aResultFetch[0]);
+					$this->sStatus=0;
+				}
+			}
+		}
+		return $aIdBat;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer la liste des objets BATI
+	* \param $oBD Objet de connexion PDO_BD
+	* \return Retourne un tableau d'objets BATI
+	*/
+	function get_aBat($oBD,$bFP){
+		$aBat=array();
+		if($this->isEmpty()){
+			$aBat="";
+		}else{
+			$aIdBat=$this->get_aId_Bat($sIdPar,$oBD,$bFP);
+			foreach($aIdBat as $sIdBat){
+				array_push($aBat,new Mj_Bati($sIdBat,$oBD, $this->sEncryptKey));
+			}
+		}
+		return $aBat;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer la liste des objets PARCELLE
+	* \param $oBD Objet de connexion PDO_BD
+	* \param $sIdPar Identifiant de la parcelle
+	* \param $sIdDnupro Identifiant du propri�taire
+	* \return Retourne un tableau d'objets PARCELLE
+	*/
+	function get_aPar($oBD,$sIdPar,$sIdDnupro){
+		$aPar=array();
+		if($this->isEmpty()){
+			$aPar="";
+		}else{
+			$aIdPar=Array($sIdPar);
+			foreach($aIdPar as $sIdPar){
+				array_push($aPar,new Mj_Parcelle($oBD,$sIdPar,$sIdDnupro,$this->sEncryptKey,$this->bAllSuf));
+			}
+		}
+		return $aPar;
+	}
+}
+?>
\ No newline at end of file
diff --git a/src/module_cadastre/web_service/class/majic_lib/Mj_Compte_Communal_Parcelles.class.inc b/src/module_cadastre/web_service/class/majic_lib/Mj_Compte_Communal_Parcelles.class.inc
new file mode 100755
index 0000000000000000000000000000000000000000..8b938de3a2067a6e92066c58cb2d8adec15aa4a6
--- /dev/null
+++ b/src/module_cadastre/web_service/class/majic_lib/Mj_Compte_Communal_Parcelles.class.inc
@@ -0,0 +1,121 @@
+<?php
+/**
+* \file Mj_Bati_Parcelles.class.inc
+* \brief Mj_Bati_Parcelles.class.inc \n \n Ce fichier contient la classe php Mj_Bati_Parcelles
+*
+* Cette classe permet de s�lectionner les attributs n�cessaires afin de traiter les batis associ�s � une parcelle.
+*
+* \author Damien Bedel
+* \author Olivier Gayte <olivier.gayte@veremes.com>
+*/
+
+require_once ("Mj.class.inc");
+require_once ("Mj_Compte_Communal_Parcelle.class.inc");
+
+class Mj_Compte_Communal_Parcelles extends Mj {
+
+	/**
+	* \param $aIdPar Tableau Identifiants des parcelles
+	* \param $oBD Objet de connexion
+	* \param $properties Tableau des propri�t�s
+	* \param $sLayerTypeParcelle Chaine Type de g�om�trie des parcelles
+	*/
+	function __construct($aIdPar,$oBD,$properties,$sLayerTypeParcelle){
+		$i=0;
+		while ($aIdPar[$i]){
+			array_push ($this->aObjects, new Mj_Compte_Communal_Parcelle("",$aIdPar[$i],$oBD));
+			$i++;
+		}
+		foreach($this->getObjects('Mj_Compte_Communal_Parcelle') as $oCptParcelle){
+			foreach($oCptParcelle->getObjects('Mj_Parcelle') as $oParcelle){
+				$oParcelle->getEmprises($properties,$oBD,$sLayerTypeParcelle);
+				foreach($oParcelle->getObjects('Mj_Emprises') as $oEmprises){
+					if($oEmprises->isError()){
+						$this->sStatus=1;
+						$this->sMessage="Erreur lors des r�cup�rations des emprises, consulter le error.log";
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	* \brief R�cup�ration de la surface totale des parcelles
+	*/
+	function getSurfaceCadastrale() {
+		$dSurfaceCadastrale = 0;
+		foreach($this->getObjects('Mj_Compte_Communal_Parcelle') as $oCptCom) {
+			$aFields=$oCptCom->getExportFields();
+			$dSurfaceCadastrale = $aFields['total_contenance'] + $dSurfaceCadastrale;
+		}
+		return $dSurfaceCadastrale;
+	}
+	/**
+	* \brief R�cup�ration de la surface totale des parcelles en mettre carr�
+	*/
+	function getSurfaceCadastraleM2() {
+		$dSurfaceCadastraleM2 = 0;
+		foreach($this->getObjects('Mj_Compte_Communal_Parcelle') as $oCptCom) {
+			$aFields=$oCptCom->getExportFields();
+			$dSurfaceCadastraleM2 = $aFields['total_contenance_m2'] + $dSurfaceCadastraleM2;
+		}
+		return $dSurfaceCadastraleM2;
+	}
+	/**
+	* \brief R�cup�ration des revenus de la subdivision fiscale des parcelles
+	*/
+	function getRevenuCadastral() {
+		$dRevenuCadastral=0;
+		foreach($this->getObjects('Mj_Compte_Communal_Parcelle') as $oCptCom) {
+			$aFields=$oCptCom->getExportFields();
+			$dRevenuCadastral = $aFields['total_revenu_cadastral'] + $dRevenuCadastral;
+		}
+		return $dRevenuCadastral;
+	}
+
+	/**
+	* \brief R�cup�ration des valeurs locatives
+	*/
+	function getValeurLocative() {
+		$dValeurLocative=0;
+		foreach($this->getObjects('Mj_Compte_Communal_Parcelle') as $oCptCom) {
+			$aFields=$oCptCom->getExportFields();
+			$dValeurLocative=$aFields['total_valeur_locative'] + $dValeurLocative;
+		}
+		return $dValeurLocative;
+	}
+	/**
+	* \brief R�cup�ration de la emprises b�ties totale des parcelles
+	*/
+	function getSurfaceCadastraleBati() {
+		$dSurfaceCadastraleBati = 0;
+		foreach($this->getObjects('Mj_Compte_Communal_Parcelle') as $oCptCom) {
+			foreach($oCptCom->getObjects('Mj_Parcelle') as $oParcelle){
+		  		foreach($oParcelle->getObjects('Mj_Emprises') as $oEmprises){
+					$aFields=$oEmprises->getExportFields();
+		  			if($aFields['titre']=="Emprise Bati"){
+						$dSurfaceCadastraleBati = $aFields['emprise_totale_intersect'] + $dSurfaceCadastraleBati;
+		  			}
+		  		}
+			}
+		}
+		return $dSurfaceCadastraleBati;
+	}
+	/**
+	* \brief Cette m�thode permet de construire un tableau correspondant au relev� de propri�t�.
+	* \return Retourne un tableau associatif correspondant au relev� de propri�t�.
+	*/
+	function getExportFields(){
+		$aExportFields=array();
+		if(!empty($this->aObjects)){
+			//partie des sommes (surfaces,revenus,valeurs locatives)
+			$aExportFields['Sum_revenu']=$this->getRevenuCadastral();
+			$aExportFields['Sum_contenance']=$this->getSurfaceCadastrale();
+			$aExportFields['Sum_contenance_m2']=$this->getSurfaceCadastraleM2();
+			$aExportFields['Sum_valeur_locative']=$this->getValeurLocative();
+			$aExportFields['Sum_contenance_bati']=$this->getSurfaceCadastraleBati();
+		}
+		return $aExportFields;
+	}
+}
+?>
\ No newline at end of file
diff --git a/src/module_cadastre/web_service/class/majic_lib/Mj_Depend_Descr.class.inc b/src/module_cadastre/web_service/class/majic_lib/Mj_Depend_Descr.class.inc
new file mode 100755
index 0000000000000000000000000000000000000000..e525d7bbea0fd8e5f9937d5287cc658181ab74db
--- /dev/null
+++ b/src/module_cadastre/web_service/class/majic_lib/Mj_Depend_Descr.class.inc
@@ -0,0 +1,102 @@
+<?php
+/**
+* \file Mj_Depend_Descr.class.inc
+* \brief Mj_Depend_Descr.class.inc \n \n Ce fichier contient la classe php Mj_Depend_Descr
+* 
+* Cette classe permet de s�lectionner les attributs n�cessaires afin de traiter la partie Description D�pendance.
+*
+* \author John Bosch
+* \author Olivier Gayte <olivier.gayte@veremes.com>
+*/
+
+require_once ("Mj.class.inc");
+
+class Mj_Depend_Descr extends Mj {
+	/**
+	* \param $sIdDep Identifiant de la d�pendance
+	* \param $oBD Objet de connexion PDO_BD
+	*/
+	function __construct($sIdDep,$oBD){
+		include $this->sRessourcesFile;
+		$this->sSql=$aSql[$oBD->sgbd]['depend_descr'];
+		$this->sSql=str_replace('$sIdDep',$sIdDep,$this->sSql);
+		$oPDOresult=$oBD->execute($this->sSql);
+		if($oBD->enErreur()){
+			$this->sStatus=1;
+			$this->sMessage=$oBD->getBDMessage();
+		}else{
+			$this->aFields=$oBD->ligneSuivante($oPDOresult);
+			$this->sStatus=0;
+		}
+	}
+	/**
+	* Cette m�thode permet de construire un tableau correspondant au relev� de propri�t�/Fiche Parcelle.
+	* \return Retourne un tableau associatif correspondant au relev� de propri�t�/Fiche Parcelle.
+	*/
+	function getExportFields(){
+		$aExportFields=array();
+		if($this->isEmpty()){
+			$aExportFields="";
+		}else{
+			$aExportFields['num_invar']=$this->aFields['invar'];
+			$aExportFields['num_pev']=$this->aFields['dnupev'];
+			$aExportFields['num_depend']=$this->aFields['dnudes'];
+			$aExportFields['nature']=$this->aFields['l_cconad'];
+			$aExportFields['surface']=$this->aFields['dsudep'];
+			$aExportFields['ponderation']=$this->aFields['dcimlc'];
+			$aExportFields['Etat']=$this->aFields['detent'];
+			$aExportFields['l_Etat']=$this->aFields['l_detent'];
+			$aExportFields['mat_gros_mur']=$this->aFields['dmatgm'];
+			$aExportFields['lib_mat_gros_mur']=$this->aFields['lib_dmatgm'];
+			$aExportFields['mat_toiture']=$this->aFields['dmatto'];
+			$aExportFields['lib_mat_toiture']=$this->aFields['lib_dmatto'];
+			$aExportFields['nb_baignoires']=$this->aFields['dnbbai'];
+			$aExportFields['nb_douches']=$this->aFields['dnbdou'];
+			$aExportFields['nb_lavabos']=$this->aFields['dnblav'];
+			$aExportFields['nb_wc']=$this->aFields['dnbwc'];
+			$aExportFields['eau']=$this->getEau();
+			$aExportFields['elect']=$this->getElect();
+			$aExportFields['chauf']=$this->getChauf();
+		}
+		return $aExportFields;
+	}
+
+	/*
+	DEPRECATED 2013
+	function getNature(){
+		if ($this->aFields['cconad'] == "TR") {
+			return "Terrasse(s)";
+		}
+		if ($this->aFields['cconad'] == "CV") {
+			return "Cave(s)";
+		}
+		if ($this->aFields['cconad'] == "GR") {
+			return "Grenier(s)";
+		}
+		if ($this->aFields['cconad'] == "GA") {
+			return "Garage(s)";
+		}
+	}
+	*/
+
+	function getEau(){
+		if($this->aFields["geaulc"] == "O"){
+			return "EAU";
+		}
+	}
+
+	function getElect(){
+		if($this->aFields["gelelc"] == "O"){
+			return "ELECT";
+		}
+	}
+
+	function getChauf(){
+		if($this->aFields["gchclc"] == "O"){
+			return "CHAUF";
+		}
+	}
+
+}
+
+?>
\ No newline at end of file
diff --git a/src/module_cadastre/web_service/class/majic_lib/Mj_Emprise.class.inc b/src/module_cadastre/web_service/class/majic_lib/Mj_Emprise.class.inc
new file mode 100755
index 0000000000000000000000000000000000000000..2ff7cf3dcd698e721a08929146ab3578334fde06
--- /dev/null
+++ b/src/module_cadastre/web_service/class/majic_lib/Mj_Emprise.class.inc
@@ -0,0 +1,101 @@
+<?php
+
+/**
+* \file Mj_Emprise.class.inc
+* \brief Mj_Emprise.class.inc \n \n Ce fichier contient la classe php Mj_Emprise
+* 
+* Cette classe permet de s�lectionner les attributs n�cessaires afin de traiter la partie parcelle. 
+*
+* \author Nicolas Chazeau
+* \author Olivier Gayte <olivier.gayte@veremes.com>
+*/
+
+/**
+* \class Mj_Emprise
+* \brief Mj_Emprise Class \n \n Mj_Emprise est une classe PHP qui h�rite de la classe Mj_Emprise.
+*
+* Cette classe permet de s�lectionner les attributs n�cessaires afin de traiter la partie Emprise. 
+*
+* \author Nicolas Chazeau
+* \author Olivier Gayte <olivier.gayte@veremes.com>
+*/
+require_once ("Mj.class.inc");
+require_once ("Mj_Attributes.class.inc");
+
+class Mj_Emprise extends Mj {
+
+	var $sIdEmprise="";
+	/**
+	* Tableau
+	*/
+	var $aAttributesEmprise= array();
+
+	/**
+	* Cette m�thode m�tier permet de r�cup�rer les informations sur les couches intersect�es par la surface de la parcelle interrog�e.
+	* \param $aField Tableau des noms de champs associ�es � la vue utilis�e.
+	* \param $aRow
+	* \param $iCompteur
+	* \param $iTolerance Valeur minimum de surface intersect� � partir de laquelle le contenu d'un enregistrement est affich�.
+	*/
+	function __construct($aField,$aRow,$iCompteur, $iTolerance) {
+		$aEmpriseParcelle= array();
+		switch(strtoupper($aField["type"])) {
+			case "POINT" :
+				$aEmpriseParcelle["intersectsuf"] = $aRow;
+				$this->sIdEmprise=$iCompteur;
+			break;
+			case "LINE" :
+				if(round($aRow["intersect"]) >= $iTolerance){
+					$aEmpriseParcelle["intersectsuf"] = $aRow;
+					$aEmpriseParcelle["intersectsuf"]["intersect_label"]= $aEmpriseParcelle["intersectsuf"]["intersect"]." m";
+					$this->sIdEmprise=$iCompteur;
+				}else{
+					$aEmpriseParcelle["intersectsuf"]["intersect"] = "0";
+					$aEmpriseParcelle["intersectsuf"]["intersect_label"] = "0 m";
+					$this->sIdEmprise=$iCompteur;
+				}
+			break;
+			case "POLYGON" :
+				if(round($aRow["intersect"]) >= $iTolerance){
+					$aEmpriseParcelle["intersectsuf"] = $aRow;
+					$aEmpriseParcelle["ratio"] = @(round(($aEmpriseParcelle["intersectsuf"]["intersect"] / $aEmpriseParcelle["intersectsuf"]["suf_parcelle"]), 2) * 100);
+					$aEmpriseParcelle["intersectsuf"]["intersect_label"].=$aEmpriseParcelle["intersectsuf"]["intersect"]." m�";
+					$aEmpriseParcelle["ratio_label"]=$aEmpriseParcelle["ratio"]." %";
+					$this->sIdEmprise=$iCompteur;
+				}else{
+					$aEmpriseParcelle["intersectsuf"]["intersect"]="0";
+					$aEmpriseParcelle["intersectsuf"]["intersect_label"]="0 m�";
+					$aEmpriseParcelle["ratio"]= "0";
+					$aEmpriseParcelle["ratio_label"]=$aEmpriseParcelle["ratio"]." %";
+					$this->sIdEmprise=$iCompteur;
+				}
+			break;
+		}
+		$this->aFields=$aEmpriseParcelle;
+		if(is_array($aEmpriseParcelle)){
+			array_push($this->aAttributesEmprise, new Mj_Attributes($aEmpriseParcelle,$aField));
+		}
+		$this->aObjects=$this->aAttributesEmprise;
+	}
+
+	/**
+	* Cette m�thode permet de construire un tableau correspondant au relev� de propri�t�.
+	* \return Retourne un tableau associatif correspondant au relev� de propri�t�.
+	*/
+	function getExportFields(){
+		$aExportFields=array();
+		if($this->isEmpty()){
+			$aExportFields="";
+		}else{
+			$aExportFields['emprise_intersect']=$this->aFields["intersectsuf"]["intersect"];
+			$aExportFields['emprise_intersect_label']=$this->aFields["intersectsuf"]["intersect_label"];
+			if($this->aFields["ratio"]){
+				$aExportFields['emprise_ratio']=$this->aFields["ratio"];
+				$aExportFields['emprise_ratio_label']=$this->aFields["ratio_label"];
+			}
+			$aExportFields['id_emprise']=$this->sIdEmprise;
+		}
+		return $aExportFields;
+	}
+
+}
\ No newline at end of file
diff --git a/src/module_cadastre/web_service/class/majic_lib/Mj_Emprises.class.inc b/src/module_cadastre/web_service/class/majic_lib/Mj_Emprises.class.inc
new file mode 100755
index 0000000000000000000000000000000000000000..df3969ca90f14ade589b68fbf7f09923962d58dc
--- /dev/null
+++ b/src/module_cadastre/web_service/class/majic_lib/Mj_Emprises.class.inc
@@ -0,0 +1,125 @@
+<?php
+
+/**
+* \file Mj_Emprises.class.inc
+* \brief Mj_Emprises.class.inc \n \n Ce fichier contient la classe php Mj_Emprises
+* 
+* Cette classe permet de s�lectionner les attributs n�cessaires afin de traiter la partie parcelle. 
+*
+* \author Nicolas Chazeau
+* \author Olivier Gayte <olivier.gayte@veremes.com>
+*/
+
+/**
+* \class Mj_Emprises
+* \brief Mj_Emprises Class \n \n Mj_Emprises est une classe PHP qui h�rite de la classe Mj_Parcelle.
+*
+* Cette classe permet de s�lectionner les attributs n�cessaires afin de traiter la partie Emprises. 
+*
+* \author Nicolas Chazeau
+* \author Olivier Gayte <olivier.gayte@veremes.com>
+*/
+require_once ("Mj.class.inc");
+require_once ("Mj_Parcelle.class.inc");
+require_once ("Mj_Emprise.class.inc");
+
+class Mj_Emprises extends Mj {
+
+	/**
+	* Cette m�thode m�tier permet de r�cup�rer les informations sur les couches intersect�es par la surface de la parcelle int�rrog�e.
+	* \param $oCadastre Objet classe Cadastre.
+	* \param $sIdPar Identifiant de la parcelle s�lectionn�e.
+	* \param $sView Vue Postgis � interroger.
+	* \param $iTolerance Valeur minimum de surface intersect� � partir de laquelle le contenu d'un enregistrement est affich�.
+	* \param $aField Tableau des noms de champs associ�es � la vue utilis�e.
+	* \param $sLayerType Type de g�om�trie contenue dans la couche parcelle de r�f�rence.
+	* \param $sInclude Fichier de rendu (*.vhtml) � afficher en cas d'erreur.
+	* \param $sType (Facultatif) Param�tre signifiant si on veut un tableau HTML (par d�faut) ou aucune mise en forme en sortie (valeurs possibles : HTML, TEXT).
+	* \private
+	* \return Un tableau HTML sous la forme d'une cha�ne de caract�res.
+	*/
+
+	/**
+	* Tableau associatif comportant la liste des objets Emprises d'une parcelle
+	*/
+	var $aEmprisesParcellesSuf=array();
+
+	function __construct($oBD, $sIdPar, $sView, $iTolerance, $aField, $sLayerType) {
+		$sFunction = "";
+		switch(strtoupper($aField["type"])) {
+			case "POINT" :
+				$sFunction.= "st_area2d";
+			break;
+			case "LINE" :
+				$sFunction.= "st_length2d";
+			break;
+			case "POLYGON" :
+				$sFunction.= "st_area2d";
+			break;
+		}
+		($sLayerType == "polygon") ? $sPrcTable = "v_parcelle" : $sPrcTable = "v_parcelle_point";
+
+		$sSql = "SELECT CAST(".$sFunction."(st_intersection(".$sPrcTable.".geom, CASE WHEN st_srid(".$sPrcTable.".geom) = st_srid(".$sView.".geom) THEN ".$sView.".geom ELSE st_transform(".$sView.".geom, st_srid(".$sPrcTable.".geom)) END)) AS DECIMAL(10,1)) AS intersect, ";
+		$sSql.= "st_area2d(".$sPrcTable.".geom) AS suf_parcelle, ".$sView.".* FROM ".$sPrcTable.", ".$sView." WHERE ";
+		$sSql.= "st_intersects(".$sPrcTable.".geom, CASE WHEN st_srid(".$sPrcTable.".geom) = st_srid(".$sView.".geom) THEN ".$sView.".geom ELSE st_transform(".$sView.".geom, st_srid(".$sPrcTable.".geom)) END) ";
+		$sSql.= "AND ".$sPrcTable.".id_par = '".$sIdPar."' ;";
+
+		$iResult=$oBD->execute($sSql);
+		if ($oBD->enErreur()) {
+			$this->sStatus = 1;
+			$this->sMessage = $oBD->getBDMessage();
+		}else{
+			$i=0;
+			while($aRow = $oBD->ligneSuivante ($iResult)) {
+				$oEmprise=new Mj_Emprise($aField,$aRow,$i,$iTolerance);
+				if($oEmprise->aFields["intersectsuf"]["intersect"]!="0"){
+					array_push($this->aEmprisesParcellesSuf,$oEmprise);
+					$i++;
+				}
+			}
+			$iResult = $oBD->fermeResultat();
+		}
+		$aValue["titre"]=$aField["title"];
+		$aValue["type_geom"]=$aField["type"];
+		$this->aFields=$aValue;
+		$this->aObjects=$this->aEmprisesParcellesSuf;
+	}
+	/*
+	* R�cup�re l'emprise totale d'un ensemble d'emprise (bati ou pos ou servitude etc)
+	* \return D�cimal l'emprise totale
+	*/
+	function getEmpriseTotale() {
+		$dEmpriseTotale = 0;
+		foreach ($this->aEmprisesParcellesSuf as $oEmprise) {
+			$dEmpriseTotale = $dEmpriseTotale + (float) $oEmprise->aFields["intersectsuf"]["intersect"];
+		}
+		return $dEmpriseTotale;
+	}
+
+	function getEmpriseRatioTotale() {
+		$dEmpriseRatioTotale = 0;
+		foreach ($this->aEmprisesParcellesSuf as $oEmprise) {
+			$dEmpriseRatioTotale = $dEmpriseRatioTotale + (float) $oEmprise->aFields["ratio"];
+		}
+		return $dEmpriseRatioTotale;
+	}
+
+	/**
+	* Cette m�thode permet de construire un tableau correspondant au relev� de propri�t�.
+	* \return Retourne un tableau associatif correspondant au relev� de propri�t�.
+	*/
+	function getExportFields(){
+		$aExportFields=array();
+		if($this->isEmpty()){
+			$aExportFields="";
+		}else{
+			$aExportFields['titre']=$this->aFields["titre"];
+			$aExportFields['type_geom']=$this->aFields["type_geom"];
+			$aExportFields['emprise_totale_intersect']=$this->getEmpriseTotale();
+			$aExportFields['emprise_totale_ratio']=$this->getEmpriseRatioTotale();
+		}
+		return $aExportFields;
+	}
+
+}
+?>
\ No newline at end of file
diff --git a/src/module_cadastre/web_service/class/majic_lib/Mj_Exon_Suf.class.inc b/src/module_cadastre/web_service/class/majic_lib/Mj_Exon_Suf.class.inc
new file mode 100755
index 0000000000000000000000000000000000000000..0d7f97aa975ce564703a290a7509d19910c01e14
--- /dev/null
+++ b/src/module_cadastre/web_service/class/majic_lib/Mj_Exon_Suf.class.inc
@@ -0,0 +1,63 @@
+<?php
+
+/**
+* \file Mj_Exon_Suf.class.inc
+* \brief Mj_Exon_Suf.class.inc \n \n Ce fichier contient la classe php Mj_Exon_Suf
+* 
+* Cette classe permet de s�lectionner les attributs n�cessaires afin de traiter la partie Exon-Suf.
+*
+* \author Damien Bedel <damien.bedel@veremes.com>
+* \author Olivier Gayte <olivier.gayte@veremes.com>
+*/
+/**
+* \class Mj_Exon_Suf
+* \brief Mj_Exon_Suf Class \n \n Mj_Exon_Suf est une classe PHP qui h�rite de la classe Mj.
+*
+* Cette classe permet de s�lectionner les attributs n�cessaires afin de traiter la partie Exon-Suf.
+*
+* \author Damien Bedel <damien.bedel@veremes.com>
+* \author Olivier Gayte <olivier.gayte@veremes.com>
+*/
+require_once ("Mj.class.inc");
+
+class Mj_Exon_Suf extends Mj {
+	/**
+	* \param $sIdSuf Identifiant de l'exon�ration de la partie d'�valuation
+	* \param $sRnuexn Num�ro d'ordre d'exoneration temporaire
+	* \param $oBD Objet de connexion PDO_BD
+	*/
+	function __construct($sIdSuf,$sRnuexn,$oBD){
+		include $this->sRessourcesFile;
+		$this->sSql = $aSql[$oBD->sgbd]['exon_suf'];
+		$this->sSql = str_replace('$sIdSuf', $sIdSuf, $this->sSql);
+		$this->sSql = str_replace('$sRnuexn', $sRnuexn, $this->sSql);
+		$oPDOresult= $oBD->execute($this->sSql);
+		if ( $oBD->enErreur()) {
+			$this->sStatus=1;
+			$this->sMessage = $oBD->getBDMessage();
+		}else{
+			$this->aFields =  $oBD->ligneSuivante ($oPDOresult);
+			$this->sStatus=0;
+		}
+	}
+	/**
+	* Cette m�thode permet de construire un tableau correspondant au relev� de propri�t�.
+	* \return Retourne un tableau associatif correspondant au relev� de propri�t�.
+	*/
+	function getExportFields(){
+		$aExportFields=array();
+		if($this->isEmpty()){
+			$aExportFields="";
+		}else{
+			$aExportFields['rnuexn']=$this->aFields['rnuexn'];
+			$aExportFields['ccolloc']=$this->aFields['ccolloc'];
+			$aExportFields['nat_exo']=$this->aFields['gnexts'];
+			$aExportFields['jfinex']=$this->aFields['jfinex'];
+			$aExportFields['pexn']=$this->aFields['pexn'];
+			$aExportFields['rcexnba']=$this->aFields['rcexnba'];
+		}
+		return $aExportFields;
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/src/module_cadastre/web_service/class/majic_lib/Mj_Exone_Pev.class.inc b/src/module_cadastre/web_service/class/majic_lib/Mj_Exone_Pev.class.inc
new file mode 100755
index 0000000000000000000000000000000000000000..9d2b1a68b1de64d542a4ed8234d3c977eea39a45
--- /dev/null
+++ b/src/module_cadastre/web_service/class/majic_lib/Mj_Exone_Pev.class.inc
@@ -0,0 +1,90 @@
+<?php
+/**
+* \file Mj_Exone_Pev.class.inc
+* \brief Mj_Exone_Pev.class.inc \n \n Ce fichier contient la classe php Mj_Exone_Pev
+* 
+* Cette classe permet de s�lectionner les attributs n�cessaires afin de traiter la partie Exone-Pev. 
+*
+* \author Damien Bedel <damien.bedel@veremes.com>
+* \author Olivier Gayte <olivier.gayte@veremes.com>
+*/
+/**
+* \class Mj_Exone_Pev
+* \brief Mj_Exone_Pev Class \n \n Mj_Exone_Pev est une classe PHP qui h�rite de la classe Mj.
+*
+* Cette classe permet de s�lectionner les attributs n�cessaires afin de traiter la partie Exone-Pev. 
+*
+* \author Damien Bedel <damien.bedel@veremes.com>
+* \author Olivier Gayte <olivier.gayte@veremes.com>
+*/
+require_once ("Mj.class.inc");
+
+class Mj_Exone_Pev extends Mj {
+	/**
+	* \param $sIdEx Identifiant de l'exon�ration de la partie d'�valuation
+	* \param $oBD Objet de connexion PDO_BD
+	*/
+	function __construct($sIdEx,$oBD){
+		include $this->sRessourcesFile;
+		$this->sSql = $aSql[$oBD->sgbd]['exone_pev'];
+		$this->sSql = str_replace('$sIdEx', $sIdEx, $this->sSql);
+		$oPDOresult= $oBD->execute($this->sSql);
+		if ($oBD->enErreur()) {
+			$this->sStatus=1;
+			$this->sMessage = $oBD->getBDMessage();  	
+		}else{
+			$this->aFields =  $oBD->ligneSuivante ($oPDOresult);
+			$this->sStatus=0;
+		}
+	}
+	/**
+	* Cette m�thode permet de construire un tableau correspondant au relev� de propri�t�.
+	* \return Retourne un tableau associatif correspondant au relev� de propri�t�.
+	*/
+	function getExportFields(){
+		$aExportFields=array();
+		if($this->isEmpty()){
+			$aExportFields="";
+		} 
+		else{
+			$aExportFields['coll']=$this->aFields['ccolloc'];
+			$aExportFields['nat_exo']=$this->aFields['gnextl'];
+			$aExportFields['an_ret']=$this->getAnret();
+			$aExportFields['an_deb']=$this->getAndeb();
+			$aExportFields['fraction_rc_exo']=$this->aFields['rcexba2'];
+			$aExportFields['pourc_exo']=$this->getPourcExo();
+			$aExportFields['tx_om']="<font color=red><b>Info Manquante</b></font>";
+			$aExportFields['coef']="<font color=red><b>Info Manquante</b></font>";
+		}
+		return $aExportFields;
+	}
+
+	/**
+	* Cette m�thode permet de r�cup�rer les deux derniers caract�res de l'attribut janimp.
+	* /return Retourne une cha�ne de caract�res.
+	*/
+	function getAnret(){
+		$sAnret=$this->aFields['janimp'];
+		$sAnret= substr("$sAnret", 2, 2);
+		return $sAnret;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer les deux derniers caract�res de l'attribut jandeb.
+	* /return Retourne une cha�ne de caract�res.
+	*/
+	function getAndeb(){
+		$sAndeb=$this->aFields['jandeb'];
+		$sAndeb= substr("$sAndeb", 2, 2);
+		return $sAndeb;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer le pourcentage d'�xon�ration � partir du champ 'pexb'.
+	* /return Retourne un entier
+	*/
+	function getPourcExo(){
+		$iPourcExo=(int)($this->aFields['pexb'])/100;
+		return $iPourcExo;
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/src/module_cadastre/web_service/class/majic_lib/Mj_Habit_Descr.class.inc b/src/module_cadastre/web_service/class/majic_lib/Mj_Habit_Descr.class.inc
new file mode 100755
index 0000000000000000000000000000000000000000..e22b0fcbd719c37011eccd40e8e1b07aa7c1fca9
--- /dev/null
+++ b/src/module_cadastre/web_service/class/majic_lib/Mj_Habit_Descr.class.inc
@@ -0,0 +1,159 @@
+<?php
+/**
+* \file Mj_Habit_Descr.class.inc
+* \brief Mj_Habit_Descr.class.inc \n \n Ce fichier contient la classe php Mj_Habit_Descr
+* 
+* Cette classe permet de s�lectionner les attributs n�cessaires afin de traiter la partie Description Habitation.
+*
+* \author John Bosch
+* \author Olivier Gayte <olivier.gayte@veremes.com>
+*/
+
+require_once ("Mj.class.inc");
+
+class Mj_Habit_Descr extends Mj {
+	/**
+	* \param $aIdDescrHab Identifiants de la partie Description Habitation (id_pev et dnudes) 
+	* \param $oBD Objet de connexion PDO_BD
+	*/
+	function __construct($aIdDescrHab,$oBD){
+		include $this->sRessourcesFile;
+		$this->sSql=$aSql[$oBD->sgbd]['habit_descr'];
+		$this->sSql=str_replace('$sIdPev',$aIdDescrHab['id_pev'],$this->sSql);
+		$this->sSql=str_replace('$sDnudes',$aIdDescrHab['dnudes'],$this->sSql);
+		$oPDOresult=$oBD->execute($this->sSql);
+		if($oBD->enErreur()){
+			$this->sStatus=1;
+			$this->sMessage=$oBD->getBDMessage();
+		}else{
+			$this->aFields=$oBD->ligneSuivante($oPDOresult);
+			$this->sStatus=0;
+		}
+	}
+
+	/**
+	* Cette m�thode permet de construire un tableau correspondant au relev� de propri�t�/Fiche Parcelle.
+	* \return Retourne un tableau associatif correspondant au relev� de propri�t�/Fiche Parcelle.
+	*/
+	function getExportFields(){
+		$aExportFields=array();
+		if($this->isEmpty()){
+			$aExportFields="";
+		}else{
+			$aExportFields['num_invar']=$this->aFields['invar'];
+			$aExportFields['num_pev']=$this->aFields['dnupev'];
+			$aExportFields['garage']=$this->getGarage();
+			$aExportFields['suf_garage']=$this->aFields['dsueic1'];
+			$aExportFields['cave']=$this->getCave();
+			$aExportFields['suf_cave']=$this->aFields['dsueic2'];
+			$aExportFields['grenier']=$this->getGrenier();
+			$aExportFields['suf_grenier']=$this->aFields['dsueic3'];
+			$aExportFields['terrasse']=$this->getTerrasse();
+			$aExportFields['suf_terrasse']=$this->aFields['dsueic4'];
+			$aExportFields['nb_baignoires']=$this->aFields['dnbbai'];
+			$aExportFields['nb_douches']=$this->aFields['dnbdou'];
+			$aExportFields['nb_lavabos']=$this->aFields['dnblav'];
+			$aExportFields['nb_wc']=$this->aFields['dnbwc'];
+			$aExportFields['nb_piece_principal']=$this->aFields['dnbppr'];
+			$aExportFields['nb_sam']=$this->aFields['dnbsam'];
+			$aExportFields['nb_chambre']=$this->aFields['dnbcha'];
+			$aExportFields['nb_cuisine_m9']=$this->aFields['dnbcu8'];
+			$aExportFields['nb_cuisine_p9']=$this->aFields['dnbcu9'];
+			$aExportFields['nb_salle_eau']=$this->aFields['dnbsea'];
+			$aExportFields['nb_annexe']=$this->aFields['dnbann'];
+			$aExportFields['nb_piece_total']=$this->aFields['dnbpdc'];
+			$aExportFields['suf_piece_total']=$this->aFields['dsupdc'];
+			$aExportFields['mat_gros_mur']=$this->aFields['dmatgm'];
+			$aExportFields['lib_mat_gros_mur']=$this->aFields['lib_dmatgm'];
+			$aExportFields['mat_toiture']=$this->aFields['dmatto'];
+			$aExportFields['lib_mat_toiture']=$this->aFields['lib_dmatto'];
+			$aExportFields['annee_constr']=$this->aFields['jannat'];
+			$aExportFields['Etat']=$this->aFields['detent'];
+			$aExportFields['l_Etat']=$this->aFields['l_detent'];
+			$aExportFields['nb_niveaux']=$this->aFields['dnbniv'];
+			$aExportFields['eau']=$this->getEau();
+			$aExportFields['elect']=$this->getElect();
+			$aExportFields['esc_serv']=$this->getEsc();
+			$aExportFields['gaz']=$this->getGaz();
+			$aExportFields['asc']=$this->getAsc();
+			$aExportFields['chauf']=$this->getChauf();
+			$aExportFields['vide_ord']=$this->getVide();
+			$aExportFields['egout']=$this->getEgout();
+		}
+		return $aExportFields;
+	}
+
+	function getGarage(){
+		if ($this->aFields['cconad1'] == "GA"){
+			return "Garage(s)";
+		}
+	}
+
+	function getCave(){
+		if ($this->aFields['cconad2'] == "CV"){
+			return "Cave(s)";
+		}
+	}
+
+	function getGrenier(){
+		if ($this->aFields['cconad3'] == "GR"){
+			return "Greniers(s)";
+		}
+	}
+
+	function getTerrasse(){
+		if ($this->aFields['cconad4'] == "TR"){
+			return "Terrasse(s)";
+		}
+	}
+
+	function getEau(){
+		if ($this->aFields["geaulc"] == "O"){
+			return "EAU";
+		}
+	}
+
+	function getElect(){
+		if ($this->aFields["gelelc"] == "O"){
+			return "ELECT";
+		}
+	}
+
+	function getEsc(){
+		if ($this->aFields["gesclc"] == "O"){
+			return "ESC_SERV";
+		}
+	}
+
+	function getGaz(){
+		if ($this->aFields["ggazlc"] == "O"){
+			return "GAZ";
+		}
+	}
+
+	function getAsc(){
+		if ($this->aFields["gasclc"] == "O"){
+			return "ASC";
+		}
+	}
+
+	function getChauf(){
+		if ($this->aFields["gchclc"] == "O"){
+			return "CHAUF";
+		}
+	}
+
+	function getVide(){
+		if ($this->aFields["gvorlc"] == "O"){
+			return "VIDE_ORD";
+		}
+	}
+
+	function getEgout(){
+		if ($this->aFields["gteglc"] == "O"){
+			return "EGOUT";
+		}
+	}
+
+}
+?>
\ No newline at end of file
diff --git a/src/module_cadastre/web_service/class/majic_lib/Mj_Lot_Local.class.inc b/src/module_cadastre/web_service/class/majic_lib/Mj_Lot_Local.class.inc
new file mode 100755
index 0000000000000000000000000000000000000000..fdbb87b1d5c39509aca079cba920282bb2e7a199
--- /dev/null
+++ b/src/module_cadastre/web_service/class/majic_lib/Mj_Lot_Local.class.inc
@@ -0,0 +1,66 @@
+<?php
+/**
+* \file Mj_Lot_Local.class.inc
+* \brief Mj_Lot_Local.class.inc \n \n Ce fichier contient la classe php Mj_Lot_Local
+* 
+* Cette classe permet de s�lectionner les attributs n�cessaires afin de traiter la partie lot-local.
+*
+* \author Damien Bedel
+* \author Olivier Gayte <olivier.gayte@veremes.com>
+*/
+/**
+* \class Mj_Lot_Local
+* \brief Mj_Lot_Local Class \n \n Mj_Lot_Local est une classe PHP qui h�rite de la classe Mj.
+*
+* Cette classe permet de s�lectionner les attributs n�cessaires afin de traiter la partie lot-local.
+*
+* \author Damien Bedel
+* \author Olivier Gayte <olivier.gayte@veremes.com>
+*/
+require_once ("Mj.class.inc");
+
+class Mj_Lot_Local extends Mj {
+	/**
+	* \param $sIdBat Identifiant de b�ti
+	* \param $sKlot Identifiant d'un lot
+	* \param $oBD Objet de connexion PDO_BD
+	*/
+	function __construct($sIdBat,$sKlot,$oBD){
+		include $this->sRessourcesFile;
+		$this->sSql=$aSql[$oBD->sgbd]['lot_local'];
+		$this->sSql=str_replace('$sIdBat', $sIdBat, $this->sSql);
+		$this->sSql=str_replace('$sKlot', $sKlot, $this->sSql);
+		$oPDOresult=$oBD->execute($this->sSql);
+		if ($oBD->enErreur()){
+			$this->sStatus=1;
+			$this->sMessage=$oBD->getBDMessage();
+		}else{
+			$this->aFields=$oBD->ligneSuivante ($oPDOresult);
+			$this->sStatus=0;
+		}
+	}
+	/**
+	* Cette m�thode permet de construire un tableau correspondant au relev� de propri�t�.
+	* \return Retourne un tableau associatif correspondant au relev� de propri�t�.
+	*/
+	function getExportFields(){
+		$aExportFields=array();
+		if($this->isEmpty()){
+			$aExportFields="";
+		}else{
+			$aExportFields['lot']=$this->getLot();
+		}
+		return $aExportFields;
+	}
+	/**
+	* Cette m�thode permet de concat�ner les diff�rents attributs d'un lot-local afin d'obtenir une seul chaine de caract�res.
+	* \return Retourne une chaine de caract�res.
+	*/
+	function getLot(){
+		$NumLot = (string) ((int) $this->aFields['dnulot']);
+		$sLot = $this->aFields['dnupdl']." LOT ".$NumLot." ".$this->aFields['dnumql']." /".$this->aFields['ddenql'];
+		return $sLot;
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/src/module_cadastre/web_service/class/majic_lib/Mj_Parcelle.class.inc b/src/module_cadastre/web_service/class/majic_lib/Mj_Parcelle.class.inc
new file mode 100755
index 0000000000000000000000000000000000000000..eec0600494fe8396d74854fdfb224656dd320d44
--- /dev/null
+++ b/src/module_cadastre/web_service/class/majic_lib/Mj_Parcelle.class.inc
@@ -0,0 +1,567 @@
+<?php
+/**
+* \file Mj_Parcelle.class.inc
+* \brief Mj_Parcelle.class.inc \n \n Ce fichier contient la classe php Mj_Parcelle
+* 
+* Cette classe permet de s�lectionner les attributs n�cessaires afin de traiter la partie parcelle. 
+*
+* \author Fabien Marty <fabien.marty@veremes.com>
+* \author Damien Bedel
+* \author Olivier Gayte <olivier.gayte@veremes.com>
+*/
+/**
+* \class Mj_Parcelle
+* \brief Mj_Parcelle Class \n \n Mj_Parcelle est une classe PHP qui h�rite de la classe Mj.
+*
+* Cette classe permet de s�lectionner les attributs n�cessaires afin de traiter la partie parcelle. 
+*
+* \author Fabien Marty <fabien.marty@veremes.com>
+* \author Damien Bedel
+* \author Olivier Gayte <olivier.gayte@veremes.com>
+*/
+require_once ("Mj.class.inc");
+require_once ("Mj_Suf.class.inc");
+require_once ("Mj_Emprises.class.inc");
+require_once ("Mj_PosPlu.class.inc");
+
+class Mj_Parcelle extends Mj {
+	/**
+	* Tableau associatif comportant la liste des objets Suf d'une parcelle
+	*/
+	var $aSuf=array();
+	/**
+	* Tableau associatif comportant la liste des objets Emprises d'une parcelle 
+	*/
+	var $aIntersect=array();
+	/**
+	* Tableau associatif comportant la liste des objets PosPlu d'une parcelle
+	*/
+	var $aPosPlu=array();
+
+	/**
+	* Constructeur
+	* \param $oBD Objet de connexion PDO_BD
+	* \param $sIdPar Identifiant de la parcelle
+	* \param $sIdDnupro Identifiant du propri�taire
+	*/
+	function __construct($oBD,$sIdPar,$sIdDnupro,$sEncryptedKey='', $bAllSuf=false){
+		include $this->sRessourcesFile;
+		$this->sSql=$aSql[$oBD->sgbd]['parcelle'];
+		$this->sSql=str_replace('$sIdPar', $sIdPar, $this->sSql);
+		$oPDOresult=$oBD->execute($this->sSql);
+		if ($oBD->enErreur()){
+			$this->sStatus=1;
+			$this->sMessage=$oBD->getBDMessage();
+		}else{
+			if (!$this->aFields=$oBD->ligneSuivante ($oPDOresult)){
+				$this->sMessage='La parcelle "'.$sIdPar.'" n\'existe pas dans les donn�es Majic.';
+				$this->sStatus=1;
+			}else{
+				$this->sStatus=0;
+			}
+		}
+		$aSuf=$this->get_aSuf($oBD,$sIdPar,$sIdDnupro, $sEncryptedKey, $bAllSuf);
+		
+		//$this->get_aPosPlu($oBD,$sIdPar);
+		if ($this->aPosPlu==""){
+			$this->aObjects=$this->aSuf;
+		}else{
+			$this->aObjects=array_merge ($this->aSuf, $this->aPosPlu);
+		}
+	}
+
+	/**
+	* Cette m�thode permet de r�cup�rer la liste des objets PosPlu d'une parcelle
+	* \param $oBD Objet de connexion PDO_BD
+	* \param $sIdPar Identifiant de la parcelle
+	* \return Retourne un tableau d'objets PosPlu
+	*/
+	function get_aPosPlu($oBD,$sIdPar){
+		$aPosPlu=array();
+		if($this->isEmpty()){
+			$this->aPosPlu="";
+		}else{
+			$sIdParpos = substr($sIdPar,3);
+			$sCodCom=$this->get_sCodCom($oBD,$sIdPar);
+			$aIdPosPlu=$this->get_aId_PosPlu($oBD,$sIdParpos,$sCodCom);
+			foreach($aIdPosPlu as $sIdPosPlu){
+				array_push($this->aPosPlu, new Mj_PosPlu($oBD,$sIdPosPlu, $sIdParpos,$sCodCom));
+			}
+		}
+		return $aPosPlu;
+	}
+	
+	function get_aId_PosPlu($oBD,$sIdPar,$sCodCom){
+		include $this->sRessourcesFile;
+		$aIdPosPlu=array();
+		$this->sSql=$aSql[$oBD->sgbd]['get_id_pos_plu'];
+		$this->sSql=str_replace('$sIdPar',$sIdPar,$this->sSql);
+		$this->sSql=str_replace('$sCodCom',$sCodCom,$this->sSql);
+		$oPDOresult=$oBD->execute($this->sSql);
+		if ($oBD->enErreur()){
+			$this->sStatus=1;
+			$this->sMessage=$oBD->getBDMessage();
+		}else{
+			while($aResultFetch=$oBD->tableauSuivant ($oPDOresult)){
+				
+				array_push($aIdPosPlu,$aResultFetch[0]);
+				$this->sStatus=0;
+			}
+		}
+		return $aIdPosPlu;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer le CodCom en fonction d'un Id_Par donn�
+	* \param $oBD Objet de connexion PDO_BD
+	* \param $sIdPar Identifiant de la parcelle
+	* \return Retourne une cha�ne de caract�res
+	*/
+	function get_sCodCom($oBD,$sIdPar){
+		include $this->sRessourcesFile;
+		$aCodCom=array();
+		$this->sSql=$aSql[$oBD->sgbd]['get_codcom'];
+		$this->sSql=str_replace('$sIdPar',$sIdPar,$this->sSql);
+		$oPDOresult=$oBD->execute($this->sSql);
+		if ($oBD->enErreur()){
+			$this->sStatus=1;
+			$this->sMessage=$oBD->getBDMessage();
+		}else{
+			while($aResultFetch=$oBD->tableauSuivant ($oPDOresult)){
+				array_push($aCodCom,$aResultFetch[0]);
+				$this->sStatus=0;
+			}
+		}
+		$sCodCom=$aCodCom[0];
+		return $sCodCom;
+	}
+
+	/**
+	* Cette m�thode permet de r�cup�rer la liste des objets Suf d'une parcelle
+	* \param $oBD Objet de connexion PDO_BD
+	* \param $sIdPar Identifiant de la parcelle
+	* \param $sIdDnupro Identifiant du propri�taire
+	* \return Retourne un tableau d'objets Suf
+	*/
+	function get_aSuf($oBD,$sIdPar,$sIdDnupro,$sEncryptedKey='',$bAllSuf){
+		if($this->isEmpty()){
+			$this->aSuf="";
+		}else{
+			$aIdSuf=$this->get_aId_Suf($oBD,$sIdPar,$sIdDnupro);
+			foreach($aIdSuf as $sIdSuf){
+				array_push($this->aSuf,new Mj_Suf($oBD,$sIdSuf,$sIdDnupro,$sEncryptedKey,$bAllSuf));
+			}
+		}
+		return $aSuf;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer les Id_Suf en fonction d'un Id_Par donn�
+	* \param $oBD Objet de connexion PDO_BD
+	* \param $sIdPar Identifiant de la parcelle
+	* \param $sIdDnupro Identifiant du propri�taire
+	* \return Retourne un tableau de cha�nes de caract�res
+	*/
+	function get_aId_Suf($oBD,$sIdPar,$sIdDnupro){
+		include $this->sRessourcesFile;
+		$aIdSuf=array();
+		$this->sSql=$aSql[$oBD->sgbd]['get_id_suf'];
+		$this->sSql=str_replace('sIdPar',$sIdPar,$this->sSql);
+		$this->sSql=str_replace('sIdDnupro',$sIdDnupro,$this->sSql);
+		$this->sSql=str_replace('sDnupro',substr($sIdDnupro,6),$this->sSql);
+		$oPDOresult=$oBD->execute($this->sSql);
+		if ($oBD->enErreur()){
+			$this->sStatus=1;
+			$this->sMessage=$oBD->getBDMessage();
+		}else{
+			while($aResultFetch=$oBD->tableauSuivant ($oPDOresult)){
+				array_push($aIdSuf,$aResultFetch[0]);
+				$this->sStatus=0;
+			}
+		}
+		return $aIdSuf;
+	}
+	/**
+	* Cette m�thode permet de construire un tableau correspondant au relev� de propri�t�.
+	* \return Retourne un tableau associatif correspondant au relev� de propri�t�.
+	*/
+	function getExportFields(){
+		$aExportFields=array();
+		if($this->isEmpty()){
+			$aExportFields="";
+		}else{
+			$aExportFields['dateheure']=date("d/m/Y")." a ".date("H:m");
+			$aExportFields['idpar']=$this->aFields['id_par'];
+			$aExportFields['date']=$this->getJdatat();
+			$aExportFields['section']=$this->aFields['ccosec'];
+			$aExportFields['num_plan']=$this->aFields['dnupla'];
+			$aExportFields['num_parc']=$this->getNumeroParcelle();
+			$aExportFields['num_voirie']=$this->getNumeroVoirie();
+			$aExportFields['adresse']=$this->getAdresseParcelle();
+			$aExportFields['code_rivoli']=$this->aFields['ccoriv'];
+			$aExportFields['num_parc_prim']=$this->aFields['dparpi'];
+			$aExportFields['fp_dp']=$this->aFields['gparnf'];
+			
+			if($this->aFields['gurbpa'] == "U" ) {
+				$aExportFields['gurbpa'] = "Oui";
+			}else{
+				$aExportFields['gurbpa'] = "Non";
+			}
+
+			if($this->aFields['gparbat'] == "" || $this->aFields['gparbat'] == "0") {
+				$aExportFields['gparbat'] = "Non";
+			}else{
+				$aExportFields['gparbat'] = "Oui";
+			}
+			$aExportFields['typevoie']=$this->aFields['typevoie'];
+			if ($this->aFields['typevoie'] == "3" ) {
+				$aExportFields['lieudit']=$this->getAdresseParcelle();
+			}else{
+				$aExportFields['lieudit']="";
+			}
+
+			$aExportFields['surface']=$this->aFields['dcntpa'];
+			$aExportFields['dnupro']=$this->aFields['dnupro'];
+			$aExportFields['s_tar']=$this->getSTar();
+			$aExportFields['suf']=$this->getSuf();
+			$aExportFields['grss_gr']=$this->getGrssGr();
+			$aExportFields['clas']=$this->getClas();
+			$aExportFields['nat_cult']=$this->getNatCult();
+			$iContenance = $this->getContenance ();
+			$aExportFields['ha']=intval($iContenance/10000);
+			if ($aExportFields['ha'] == 0) {
+				$aExportFields['ha']= ' ';
+			}
+			$aExportFields['a']=intval(($iContenance%10000)/100);
+			$sContenanceA=$aExportFields['a'];
+			$sContenanceA=strval($sContenanceA);
+			$sTlenA=strlen($sContenanceA);
+			if ($aExportFields['ha'] == ' ' and $aExportFields['a'] == 0){
+				$aExportFields['a']= ' ';
+			}else{
+				if ($aExportFields['ha'] == ' ' and $sTlenA == 2 and (substr($aExportFields['a'],0,1)== 0)) {
+					$sDeuxiemeValeur= substr($aExportFields['a'],1,1);
+					$aExportFields['a']= ' '.$sDeuxiemeValeur;
+				} else {
+					if ($aExportFields['ha'] != ' ' and $sTlenA == 1) {
+						$aExportFields['a']= '0'.$aExportFields['a'];
+					}
+				}
+			}
+			$aExportFields['ca']=$iContenance%100;
+			$sContenanceCa=$aExportFields['ca'];
+			$sContenanceCa= strval($sContenanceCa);
+			$sTlen=strlen($sContenanceCa);
+			if ($aExportFields['a'] != 0)
+				if ($sTlen == 1) {
+					$aExportFields['ca']= '0'.$aExportFields['ca'];
+				}
+			$aExportFields['revenu_cadastral_avec_exo']=$this->getRevenuCadastralAvecExo();
+			$aExportFields['revenu_cadastral_com_avec_exo']=$this->getRevenuCadastralComAvecExo();
+			$aExportFields['revenu_cadastral_dep_avec_exo']=$this->getRevenuCadastralDepAvecExo();
+			$aExportFields['revenu_cadastral_reg_avec_exo']=$this->getRevenuCadastralRegAvecExo();
+			$aExportFields['revenu_cadastral']=$this->getRevenuCadastral();
+			$aExportFields['revenu_cadastral_txt']=$this->setFloatToText($this->getRevenuCadastral());
+			$aExportFields['revenu_reference']=$this->getRevenuReference();
+			$aExportFields['revenu_reference_txt']=$this->setFloatToText($this->getRevenuReference());
+			//$aExportFields['nat_exo']=$this->getNatExo();
+			$aExportFields['contenance']=$iContenance;
+		}
+		return $aExportFields;
+	}
+	/**
+	* Cette m�thode permet d'avoir l'attribut dnupla sur 4 caract�res.
+	* \return Retourne une cha�ne de caract�res.
+	*/
+	function getNumeroParcelle(){
+		if(strlen($this->aFields['dnupla']) == 1){
+			return "000".$this->aFields['dnupla'];
+		}
+		if(strlen($this->aFields['dnupla']) == 2){
+			return "00".$this->aFields['dnupla'];
+		}
+		if(strlen($this->aFields['dnupla']) == 3){
+			return "0".$this->aFields['dnupla'];
+		}
+		if(strlen($this->aFields['dnupla']) == 4){
+			return $this->aFields['dnupla'];
+		}
+		
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer les deux derniers caract�res de l'attribut Jdatat et d'y ajouter 1.
+	* \return Retourne une cha�ne de caract�res.
+	*/
+	function getJdatat(){
+		$sNewJdatat=$this->aFields['jdatat'];
+		if (preg_match( '`^\d{1,2}/\d{1,2}/\d{4}$`' , $sNewJdatat ) ){
+			$sNewJdatat=substr("$sNewJdatat", 6, 4)+1;
+			$sNewJdatat=(string)(substr("$sNewJdatat", 2, 2));
+		}else if (preg_match( '`^\d{1,2}/\d{1,2}/\d{2}$`' , $sNewJdatat ) ){
+			$sNewJdatat=(string) (substr("$sNewJdatat", 6, 2)+1);
+			if(strlen($sNewJdatat) == 1){
+				$sNewJdatat='0'.$sNewJdatat;
+			}
+			$sNewJdatat=(string) (substr("$sNewJdatat", -2, 2));
+		}else{
+			$sNewJdatat=substr("$sNewJdatat", 4, 4)+1;
+			$sNewJdatat=(string)(substr("$sNewJdatat", 2, 2));
+		}
+		return $sNewJdatat;
+	}
+	/**
+	* Cette m�thode permet de concat�ner les attributs dnvoiri et indic.
+	* \return Retourne une cha�ne de caract�res.
+	*/
+	function getNumeroVoirie(){
+		$sNumeroVoirie = ltrim($this->aFields['dnvoiri'],'0').$this->aFields['dindic'];
+		return $sNumeroVoirie;
+	}
+	/**
+	* Cette m�thode permet de concat�ner les attributs cconvo et dvoilib.
+	* \return Retourne une cha�ne de caract�res.
+	*/
+	function getAdresseParcelle(){
+		$sAdresseParcelle = rtrim($this->aFields['cconvo'])." ".rtrim($this->aFields['dvoilib']);
+		return $sAdresseParcelle;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer la valeur de l'attribut 's_tar' dans le tableau aSuf.
+	* \return Retourne une cha�ne de caract�res.
+	*/
+	function getSTar(){
+		if(count($this->aSuf)==1) {
+			return $this->aSuf[0]->aFields['ccostn'];
+		} else {
+			return '';
+		}
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer la valeur de l'attribut 'suf' dans le tableau aSuf.
+	* \return Retourne une cha�ne de caract�res.
+	*/
+	function getSuf(){
+		if(count($this->aSuf)==1) {
+			return $this->aSuf[0]->aFields['ccosub'];
+		}else {
+			return '';
+		}
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer la valeur de l'attribut 'grss_gr' dans le tableau aSuf.
+	* \return Retourne une cha�ne de caract�res.
+	*/
+	function getGrssGr(){
+		if(count($this->aSuf)==1) {
+			return $this->aSuf[0]->aFields['dsgrpf'];
+		}else {
+			return '';
+		}
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer la valeur de l'attribut 'clas' dans le tableau aSuf.
+	* \return Retourne une cha�ne de caract�res.
+	*/
+	function getClas(){
+		if(count($this->aSuf)==1) {
+			return $this->aSuf[0]->aFields['dclssf'];
+		}else {
+			return '';
+		}
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer la valeur de l'attribut 'nat_cult' dans le tableau aSuf.
+	* \return Retourne une cha�ne de caract�res.
+	*/
+	function getNatCult(){
+		if(count($this->aSuf)==1) {
+			return $this->aSuf[0]->aFields['cnatsp'];
+		}else {
+			return '';
+		}
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer la valeur de l'attribut 'revenu cadastral' dans le tableau aSuf.
+	* \return Retourne un nombre r�el (float).
+	*/
+	function getRevenuCadastral(){
+		$fRevenuCadastral = 0;
+	  	foreach ($this->aSuf as $oSuf) {
+	    	$fRevenuCadastral = $fRevenuCadastral + (float) $oSuf->getRevenuCadastral();
+		} 
+		return $fRevenuCadastral;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer la valeur de l'attribut 'revenu reference' dans le tableau aSuf.
+	* \return Retourne un nombre r�el (float).
+	*/
+	function getRevenuReference(){
+		$fRevenuReference = 0;
+		foreach ($this->aSuf as $oSuf) {
+			$fRevenuReference = $fRevenuReference + (float) $oSuf->getRevenuReference();
+		} 
+		return $fRevenuReference;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer la valeur de l'attribut 'revenu cadastral' pour des parcelles avec exon�ration dans le tableau aSuf.
+	* \return Retourne un nombre r�el (float).
+	*/
+	function getRevenuCadastralAvecExo(){
+		$fRevenuCadastralAvecExo = 0;
+		foreach ($this->aSuf as $oSuf) {
+			if(ereg ("TA", $oSuf->getNatExo())){
+				$fRevenuCadastralAvecExo = $fRevenuCadastralAvecExo + (float) $oSuf->getRevenuCadastral();
+			}
+		} 
+		return $fRevenuCadastralAvecExo;
+	}
+
+	/**
+	* Cette m�thode permet de r�cup�rer la valeur de l'attribut 'revenu cadastral' pour des parcelles avec exon�ration dans le tableau aSuf.
+	* lorsque l'exoneration est procur� par une commune, un groupement de commune ou toutes collectivit�
+	* \return Retourne un nombre r�el (float).
+	*/
+	function getRevenuCadastralComAvecExo(){
+		$fRevenuCadastralComAvecExo = 0;
+		foreach ($this->aSuf as $oSuf) {
+			if(ereg ("EP", $oSuf->aFields['gnexps']) or ereg("CD", $oSuf->aFields['gnexps']) or ereg("CR", $oSuf->aFields['gnexps']) or ereg("NI", $oSuf->aFields['gnexps']) or ereg("RT", $oSuf->aFields['gnexps'])){
+				$fRevenuCadastralComAvecExo = $fRevenuCadastralComAvecExo + (float) $oSuf->getRevenuCadastral();
+			} else {
+				if($oSuf->getCcolloc("C") == true) {
+					$fRevenuCadastralComExo = $oSuf->getRevenuCadastralExo("C");
+					$fRevenuCadastralComAvecExo = $fRevenuCadastralComAvecExo + (float) $fRevenuCadastralComExo;
+				} else {
+					if($oSuf->getCcolloc("TC") == true) {
+						$fRevenuCadastralComExo = $oSuf->getRevenuCadastralExo("TC");
+						$fRevenuCadastralComAvecExo = $fRevenuCadastralComAvecExo + (float) $fRevenuCadastralComExo;
+					} else {
+						if($oSuf->getCcolloc("GC") == true) {
+							$fRevenuCadastralComExo = $oSuf->getRevenuCadastralExo("GC");
+					    	$fRevenuCadastralComAvecExo = $fRevenuCadastralComAvecExo + (float) $fRevenuCadastralComExo;
+						}
+					}
+				}
+			}
+		}
+		return $fRevenuCadastralComAvecExo;
+	}
+	
+	function getRevenuCadastralTaxeADAvecExo(){
+		$fRevenuCadastralTaxeADAvecExo = 0;
+		foreach ($this->aSuf as $oSuf) {
+			if(ereg ("EP", $oSuf->aFields['gnexps']) or ereg("CD", $oSuf->aFields['gnexps']) or ereg("CR", $oSuf->aFields['gnexps']) or ereg("NI", $oSuf->aFields['gnexps']) or ereg("RT", $oSuf->aFields['gnexps'])){
+				$fRevenuCadastralTaxeADAvecExo = $fRevenuCadastralTaxeADAvecExo + (float) $oSuf->getRevenuCadastral();
+			} else {
+				if($oSuf->getCcolloc("A") == true) {
+					
+					$fRevenuCadastralTaxeADExo = $oSuf->getRevenuCadastralExo("A");
+					
+					$fRevenuCadastralTaxeADAvecExo = $fRevenuCadastralTaxeADAvecExo + (float) $fRevenuCadastralTaxeADExo;
+				}
+			}
+		}
+		return $fRevenuCadastralTaxeADAvecExo;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer la valeur de l'attribut 'revenu cadastral' pour des parcelles avec exon�ration dans le tableau aSuf.
+	* lorsque l'exoneration est procur� par le d�partement ou toutes collectivit�
+	* \return Retourne un nombre r�el (float).
+	*/
+	function getRevenuCadastralDepAvecExo(){
+		$fRevenuCadastralDepAvecExo = 0;
+		foreach ($this->aSuf as $oSuf) {
+			if(ereg ("EP", $oSuf->aFields['gnexps']) or ereg("CD", $oSuf->aFields['gnexps']) or ereg("DR", $oSuf->aFields['gnexps']) or ereg("NI", $oSuf->aFields['gnexps']) or ereg("RT", $oSuf->aFields['gnexps'])){
+				$fRevenuCadastralDepAvecExo = $fRevenuCadastralDepAvecExo + (float) $oSuf->getRevenuCadastral();
+			} else {
+				if($oSuf->getCcolloc("D") == true) {
+					$fRevenuCadastralDepExo = $oSuf->getRevenuCadastralExo("D");
+					$fRevenuCadastralDepAvecExo = $fRevenuCadastralDepAvecExo + (float) $fRevenuCadastralDepExo;
+				} else {
+					if($oSuf->getCcolloc("TC") == true) {
+						$fRevenuCadastralDepExo = $oSuf->getRevenuCadastralExo("TC");
+						$fRevenuCadastralDepAvecExo = $fRevenuCadastralDepAvecExo + (float) $fRevenuCadastralDepExo;
+					}
+				}
+			}
+		}
+		return $fRevenuCadastralDepAvecExo;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer la valeur de l'attribut 'revenu cadastral' pour des parcelles avec exon�ration dans le tableau aSuf.
+	* lorsque l'exoneration est procur� par la r�gion ou toutes collectivit�
+	* \return Retourne un nombre r�el (float).
+	*/
+	function getRevenuCadastralRegAvecExo(){
+		$fRevenuCadastralRegAvecExo = 0;
+		foreach ($this->aSuf as $oSuf) {
+			if(ereg ("EP", $oSuf->aFields['gnexps']) or ereg("DR", $oSuf->aFields['gnexps']) or ereg("CR", $oSuf->aFields['gnexps']) or ereg("NI", $oSuf->aFields['gnexps']) or ereg("RT", $oSuf->aFields['gnexps'])){
+				$fRevenuCadastralRegAvecExo = $fRevenuCadastralRegAvecExo + (float) $oSuf->getRevenuCadastral();
+			} else {
+				if($oSuf->getCcolloc("R") == true) {
+					$fRevenuCadastralRegExo = $oSuf->getRevenuCadastralExo("R");
+					$fRevenuCadastralRegAvecExo = $fRevenuCadastralRegAvecExo + (float) $fRevenuCadastralRegExo;
+				} else {
+					if($oSuf->getCcolloc("TC") == true) {
+						$fRevenuCadastralRegExo = $oSuf->getRevenuCadastralExo("TC");
+						$fRevenuCadastralRegAvecExo = $fRevenuCadastralRegAvecExo + (float) $fRevenuCadastralRegExo;
+					}
+				}
+			}
+		}
+		return $fRevenuCadastralRegAvecExo;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer la valeur de l'attribut 'contenance' pour des parcelles avec exon�ration dans le tableau aSuf.
+	* \return Retourne un entier.
+	*/
+	function getContenance (){
+		$iContenance=0;
+		foreach($this->aSuf as $oSuf){
+			$iContenance=$iContenance+$oSuf->getContenance();
+		}
+		return $iContenance;
+	}
+	
+	/**
+	* Cette m�thode permet de r�up�rer l'ensemble des emprises de la parcelles � partir des properties de la fiche d'urbanisme
+	* \return 
+	*/
+	function getEmprises($aProperties,$oBD,$sLayerTypeParcelle) {
+		// boucler sur toutes les couches � intersecter
+		if(isset($aProperties["cadastre"]["fiche_urb"]["intersect"]["views"])) {
+			foreach($aProperties["cadastre"]["fiche_urb"]["intersect"]["views"] as $sView => $aViewValue) {
+				$oEmprises = new Mj_Emprises($oBD,$this->aFields['id_par'],$sView, $aProperties["cadastre"]["fiche_urb"]["intersect"]["tolerance"], $aViewValue, $sLayerTypeParcelle);				
+				array_push($this->aIntersect,$oEmprises);
+			}
+		}
+		// calcule de l'emprise du bati
+		$sViewBati=$aProperties["cadastre"]["view"]["bati"];
+		if(isset($aProperties["cadastre"]["view"]["bati"])){
+			$aField["type"]="POLYGON";
+			$aField["title"]="Emprise Bati";
+			$oEmprises = new Mj_Emprises($oBD,$this->aFields['id_par'],$sViewBati,$aProperties["cadastre"]["fiche_urb"]["intersect"]["tolerance"], $aField, $sLayerTypeParcelle);
+			array_push($this->aIntersect,$oEmprises);
+		}
+		$this->aObjects=array_merge($this->aObjects,$this->aIntersect);
+	}
+
+	/**
+	* Cette m�thode permet de r�cup�rer la valeur de l'attribut 'nat_exo' dans le tableau aSuf.
+	* \return Retourne une cha�ne de caract�res.
+	*
+	*/
+	/*function getNatExo(){
+		if(count($this->aSuf)==1) {
+			return $this->aSuf[0]->getNatExo();
+		} else{
+			return '';
+		}
+	}*/
+	/**
+	* Cette m�thode permet de formater un d�cimal pour l'affichage.
+	* \return Retourne une chaine
+	*/
+	function setFloatToText($fFloat){
+		return number_format($fFloat,2,'.','');
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/src/module_cadastre/web_service/class/majic_lib/Mj_Pev.class.inc b/src/module_cadastre/web_service/class/majic_lib/Mj_Pev.class.inc
new file mode 100755
index 0000000000000000000000000000000000000000..d33ebb882cdab0a88619ea843eccc055d9f0a9ad
--- /dev/null
+++ b/src/module_cadastre/web_service/class/majic_lib/Mj_Pev.class.inc
@@ -0,0 +1,270 @@
+<?php
+/**
+* \file Mj_Pev.class.inc
+* \brief Mj_Pev.class.inc \n \n Ce fichier contient la classe php Mj_Pev
+* 
+* Cette classe permet de s�lectionner les attributs n�cessaires afin de traiter la partie pev. 
+*
+* \author Damien Bedel
+* \author Fabien Marty <fabien.marty@veremes.com>
+* \author Olivier Gayte <olivier.gayte@veremes.com>
+*/
+/**
+* \class Mj_Pev
+* \brief Mj_Pev Class \n \n Mj_Pev est une classe PHP qui h�rite de la classe Mj.
+*
+* Cette classe permet de s�lectionner les attributs n�cessaires afin de traiter la partie pev. 
+*
+* \author Damien Bedel
+* \author Fabien Marty <fabien.marty@veremes.com>
+* \author Olivier Gayte <olivier.gayte@veremes.com>
+*/
+require_once ("Mj.class.inc");
+require_once ("Mj_Exone_Pev.class.inc");
+require_once ("Mj_Habit_Descr.class.inc");
+require_once ("Mj_Depend_Descr.class.inc");
+require_once ("Mj_Prof_Descr.class.inc");
+
+class Mj_Pev extends Mj {
+	/**
+	* Tableau associatif comportant la liste des objets Exone_Pev du b�ti.
+	*/
+	var $aExPev=array();
+	/**
+	* Tableau associatif comportant la liste des objets Descr de(s) habitation(s)
+	*/
+	var $aDescr_Hab=array();
+	/**
+	* Tableau associatif comportant la liste des objets Descr de(s) d�pendance(s)
+	*/
+	var $aDescr_Depend=array();
+	/**
+	* Tableau associatif comportant la liste des objets Descr professionel
+	*/
+	var $aDescr_Prof=array();
+	/**
+	* \param $sIdPev Identifiant de la partie d'Evaluation
+	* \param $oBD Objet de connexion PDO_BD
+	*/
+	function __construct($sIdPev,$oBD){
+		include $this->sRessourcesFile;
+		$this->sSql=$aSql[$oBD->sgbd]['pev'];
+		$this->sSql=str_replace('$sIdPev', $sIdPev, $this->sSql);
+		$oPDOresult=$oBD->execute($this->sSql);
+		if ($oBD->enErreur()) {
+			$this->sStatus=1;
+			$this->sMessage=$oBD->getBDMessage();  	
+		}else{
+			$this->aFields=$oBD->ligneSuivante ($oPDOresult);
+			$this->sStatus=0;
+		}
+		$this->aExPev=$this->get_aEx_Pev($oBD);
+		$this->aDescr_Hab=$this->get_aDescr_Hab($sIdPev,$oBD);
+		$this->aDescr_Depend=$this->get_aDescr_Depend($sIdPev,$oBD);
+		$this->aDescr_Prof=$this->get_aDescr_Prof($sIdPev,$oBD);
+		$this->aObjects=array_merge($this->aExPev,$this->aDescr_Hab,$this->aDescr_Depend,$this->aDescr_Prof);
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer les Id_Ex en fonction d'un Id_Pev donn�
+	* \param $oBD Objet de connexion PDO_BD
+	* \return Retourne un tableau de cha�nes de caract�res.
+	*/
+	function get_aId_Ex_Pev($oBD){
+		if($this->isEmpty()){
+			$aIdExPev="";
+		}else{
+			include $this->sRessourcesFile;
+			$aIdExPev=array();
+			$this->sSql=$aSql[$oBD->sgbd]['get_id_ex_pev'];
+			$this->sSql=str_replace('$sIdPev', $this->aFields['id_pev'], $this->sSql);
+			$oPDOresult=$oBD->execute($this->sSql);
+			if($oBD->enErreur()){
+				$this->sStatus=1;
+				$this->sMessage=$oBD->getBDMessage();
+			}else{
+				while($aResultFetch=$oBD->tableauSuivant ($oPDOresult)){
+					array_push($aIdExPev,$aResultFetch[0]);
+					$this->sStatus=0;
+				}
+			}
+		}
+		return $aIdExPev;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer la liste des objets Exone_Pev du b�ti
+	* \return Retourne un tableau d'objets Exone_Pev
+	*/
+	function get_aEx_Pev($oBD){
+		$aExPev=array();
+		if($this->isEmpty()){
+			$aExPev="";
+		}else{
+			$aIdExPev=$this->get_aId_Ex_Pev($oBD);
+			foreach($aIdExPev as $sValue){
+				array_push($aExPev,new Mj_Exone_Pev($sValue,$oBD));
+			}
+		}
+		return $aExPev;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer les Id_Descr_Hab en fonction d'un Id_Pev donn�
+	* \param $oBD Objet de connexion PDO_BD
+	* \return Retourne un tableau de cha�nes de caract�res.
+	*/
+	function get_aId_Descr_Hab($oBD){
+		if($this->isEmpty()){
+			$aIdDescrHab="";
+		}else{
+			include $this->sRessourcesFile;
+			$aIdDescrHab=array();
+			$this->sSql=$aSql[$oBD->sgbd]['get_id_descr_hab'];
+			$this->sSql=str_replace('$sIdPev',$this->aFields['id_pev'],$this->sSql);
+			$oPDOresult=$oBD->execute($this->sSql);
+			if($oBD->enErreur()){
+				$this->sStatus=1;
+				$this->sMessage=$oBD->getBDMessage();
+			}else{
+				while($aResultFetch=$oBD->ligneSuivante($oPDOresult)){
+					array_push($aIdDescrHab,$aResultFetch);
+					$this->sStatus=0;
+				}
+			}
+		}
+		return $aIdDescrHab;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer la liste des objets Descr du b�ti
+	* \return Retourne un tableau d'objets Descr_Hab
+	*/
+	function get_aDescr_Hab($sIdPev,$oBD){
+		$aDescrHab=array();
+		if($this->isEmpty()){
+			$aDescrHab="";
+		}else{
+			$aIdDescrHab=$this->get_aId_Descr_Hab($oBD);
+			foreach($aIdDescrHab as $aValue){
+				array_push($aDescrHab,new Mj_Habit_Descr($aValue,$oBD));
+			}
+			//array_push($aDescrHab,new Mj_Habit_Descr($sIdPev,$oBD));
+		}
+		return $aDescrHab;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer les Id_Descr_Depend en fonction d'un Id_Pev donn�
+	* \param $oBD Objet de connexion PDO_BD
+	* \return Retourne un tableau de cha�nes de caract�res.
+	*/
+	function get_aId_Descr_Depend($oBD){
+		if($this->isEmpty()){
+			$aIdDescrDepend="";
+		}else{
+			include $this->sRessourcesFile;
+			$aIdDescrDepend=array();
+			$this->sSql=$aSql[$oBD->sgbd]['get_id_descr_depend'];
+			$this->sSql=str_replace('$sIdPev', $this->aFields['id_pev'], $this->sSql);
+			$oPDOresult=$oBD->execute($this->sSql);
+			if($oBD->enErreur()){
+				$this->sStatus=1;
+				$this->sMessage=$oBD->getBDMessage();
+			}else{
+				while($aResultFetch=$oBD->tableauSuivant($oPDOresult)){
+					array_push($aIdDescrDepend,$aResultFetch[0]);
+					$this->sStatus=0;
+				}
+			}
+		}
+		return $aIdDescrDepend;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer la liste des objets Descr_Depend du b�ti
+	* \return Retourne un tableau d'objets Descr_Depend
+	*/
+	function get_aDescr_Depend($sIdPev,$oBD){
+		$aDescrDepend=array();
+		if($this->isEmpty()){
+			$aDescrDepend="";
+		}else{
+			$aIdDescrDepend=$this->get_aId_Descr_Depend($oBD);
+			foreach($aIdDescrDepend as $sValue){
+				array_push($aDescrDepend,new Mj_Depend_Descr($sValue,$oBD));
+			}
+		}
+		return $aDescrDepend;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer la liste des objets Descr_Prof du b�ti
+	* \return Retourne un tableau d'objets Descr_Prof
+	*/
+	function get_aDescr_Prof($sIdPev,$oBD){
+		$aDescr_Prof=array();
+		if($this->isEmpty()){
+			$aDescr_Prof="";
+		}else{
+			array_push($aDescr_Prof,new Mj_Prof_Descr($sIdPev,$oBD));
+		}
+		return $aDescr_Prof;
+	}
+	/**
+	* Cette m�thode permet de construire un tableau correspondant au relev� de propri�t�.
+	* \return Retourne un tableau associatif correspondant au relev� de propri�t�.
+	*/
+	function getExportFields(){
+		$aExportFields=array();
+		if($this->isEmpty()){
+			$aExportFields="";
+		}else{
+			$aExportFields['s_tar']=$this->aFields['ccostb'];
+			$aExportFields['af']=$this->aFields['ccoaff'];
+			$aExportFields['l_nature']=$this->aFields['l_ccoaff'];
+			$aExportFields['cat']=$this->aFields['dcapec'];
+			$aExportFields['nat_exo']=$this->getNatExo();
+			$aExportFields['revenu_cadastral']=$this->getRevenuCadastral();
+			$aExportFields['num_pev']=$this->aFields['dnupev'];
+			$aExportFields['val_loc_ref']=$this->aFields['dvlper'];
+			$aExportFields['val_loc_ann']=$this->aFields['dvlpera'];
+			$aExportFields['nature']=$this->aFields['gnexpl'];
+			$aExportFields['l_nat_exon']=$this->aFields['l_gnexpl'];
+			$aExportFields['local_type']=$this->aFields['dnuref'];
+		}
+		return $aExportFields;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer le revenu cadastral d'une Pev.
+	* \return Retourne un entier.
+	*/
+	function getRevenuCadastral(){
+		if ($this->getNatExo()==''){
+			$iRevenuCadastral=(int)$this->aFields['bipevla1'];
+		}else{
+			$fRevenuCadastral=(float)($this->aFields['dvlpera'])/2;
+			$iRevenuCadastral=round($fRevenuCadastral);
+		}
+		return $iRevenuCadastral;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer le revenu cadastral d'une Pev.
+	* \return Retourne un float.
+	*/
+	function getRevenuCadastralfloat(){
+		if ($this->getNatExo()==''){
+			$fRevenuCadastral=(float)$this->aFields['bipevla1'];
+		}else{
+			$fRevenuCadastral=(float)($this->aFields['dvlpera'])/2;
+		}
+		return $fRevenuCadastral;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer la nature de l'exon�ration qui peut provenir soit de l'attribut 'gnexpl' soit de l'attribut 'gnextl' contenu dans le tableau aExPev.
+	* \return Retourne une cha�ne de caract�res.
+	*/
+	function getNatExo(){
+		if(trim($this->aFields['gnexpl'])==''){
+			$sNatExo=$this->aExPev[0]->aFields['gnextl'];
+		}else{
+			$sNatExo=$this->aFields['gnexpl'];
+		}
+		return $sNatExo;
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/src/module_cadastre/web_service/class/majic_lib/Mj_PosPlu.class.inc b/src/module_cadastre/web_service/class/majic_lib/Mj_PosPlu.class.inc
new file mode 100755
index 0000000000000000000000000000000000000000..5a9edf8e2bcfd43db60e5633d7f23e1c08f14132
--- /dev/null
+++ b/src/module_cadastre/web_service/class/majic_lib/Mj_PosPlu.class.inc
@@ -0,0 +1,69 @@
+<?php
+/**
+* \file Mj_Parcelle.class.inc
+* \brief Mj_Parcelle.class.inc \n \n Ce fichier contient la classe php Mj_Parcelle
+* 
+* Cette classe permet de s�lectionner les attributs POS/PLU n�cessaires.
+*
+* \author John Bosch <john.bosch@veremes.com>
+*/
+require_once ("Mj.class.inc");
+require_once ("Mj_Parcelle.class.inc");
+
+class Mj_PosPlu extends Mj {
+
+	/**
+	* Constructeur
+	* \param $oBD Objet de connexion PDO_BD
+	* \param $sIdPar Identifiant de la parcelle
+	* \param $sCodCom Code Insee de la commune
+	*/
+	function __construct($oBD,$sObjectId, $sIdPar,$sCodCom) {
+		include $this->sRessourcesFile;
+		$this->sSql=$aSql[$oBD->sgbd]['pos_plu'];
+		$this->sSql=str_replace('$sObjectId', $sObjectId, $this->sSql);
+		$this->sSql=str_replace('$sIdPar', $sIdPar, $this->sSql);
+		$this->sSql=str_replace('$sCodCom', $sCodCom, $this->sSql);
+		$oPDOresult=$oBD->execute($this->sSql);
+		if ( $oBD->enErreur()) {
+		    $this->sStatus=1;
+		    $this->sMessage=$oBD->getBDMessage();    	
+		}else{
+			while($aRow = $oBD->ligneSuivante ($oPDOresult)) {
+				$this->aFields=$aRow;
+			}
+			
+			$this->sStatus=0;
+		}	
+	
+	}
+	/**
+	* Cette m�thode permet de construire un tableau correspondant au relev� de propri�t�/Fiche Parcelle.
+	* \return Retourne un tableau associatif correspondant au relev� de propri�t�/Fiche Parcelle.
+	*/
+	function getExportFields(){
+		$aExportFields=array();
+		if($this->isEmpty()){
+			$aExportFields="";
+		} 
+		else{
+			$aExportFields['zonage']=$this->aFields['TYPE'];
+			$aExportFields['lib_zonage']=$this->aFields['LIBELLE'];
+			$aExportFields['surface']=$this->getSurface();
+			$aExportFields['cos']=$this->aFields['COS'];
+			$aExportFields['ces']=$this->aFields['CES'];
+			$aExportFields['hauteur']=$this->aFields['HAUTEUR'];
+			$aExportFields['idreg']=$this->aFields['IDREG'];
+			$aExportFields['codecom']=$this->aFields['CODCOM'];
+		}
+		return $aExportFields;
+	}
+	function getSurface(){
+		$iSurface= round($this->aFields['SURFACE']);
+		return $iSurface;
+	}
+	
+
+}
+
+?>
\ No newline at end of file
diff --git a/src/module_cadastre/web_service/class/majic_lib/Mj_Prof_Descr.class.inc b/src/module_cadastre/web_service/class/majic_lib/Mj_Prof_Descr.class.inc
new file mode 100755
index 0000000000000000000000000000000000000000..8c24aed515a0309fb57579b5e44ac57e673fbed5
--- /dev/null
+++ b/src/module_cadastre/web_service/class/majic_lib/Mj_Prof_Descr.class.inc
@@ -0,0 +1,54 @@
+<?php
+/**
+* \file Mj_Prof_Descr.class.inc
+* \brief Mj_Prof_Descr.class.inc \n \n Ce fichier contient la classe php Mj_Prof_Descr
+* 
+* Cette classe permet de s�lectionner les attributs n�cessaires afin de traiter la partie Description Professionel.
+*
+* \author John Bosch
+* \author Olivier Gayte <olivier.gayte@veremes.com>
+*/
+
+require_once ("Mj.class.inc");
+
+class Mj_Prof_Descr extends Mj {
+	/**
+	* \param $sIdPev Identifiant de la partie d'Evaluation
+	* \param $oBD Objet de connexion PDO_BD
+	*/
+	function __construct($sIdPev,$oBD){
+		include $this->sRessourcesFile;
+		$this->sSql=$aSql[$oBD->sgbd]['prof_descr'];
+		$this->sSql=str_replace('$sIdPev', $sIdPev, $this->sSql);
+		$oPDOresult=$oBD->execute($this->sSql);
+		if ( $oBD->enErreur()) {
+		    $this->sStatus=1;
+		    $this->sMessage=$oBD->getBDMessage();    	
+		}
+		else{
+			$this->aFields=$oBD->ligneSuivante ($oPDOresult);
+			$this->sStatus=0;
+		}	
+		
+	}
+	/**
+	* Cette m�thode permet de construire un tableau correspondant au relev� de propri�t�/Fiche Parcelle.
+	* \return Retourne un tableau associatif correspondant au relev� de propri�t�/Fiche Parcelle.
+	*/
+	function getExportFields(){
+		$aExportFields=array();
+		if($this->isEmpty()){
+			$aExportFields="";
+		} 
+		else{
+			$aExportFields['num_invar']=$this->aFields['invar'];
+			$aExportFields['num_pev']=$this->aFields['dnupev'];
+			$aExportFields['num_prof']=$this->aFields['dnudes'];
+			$aExportFields['surface']=$this->aFields['vsurzt'];
+		}
+		return $aExportFields;
+	}
+	
+}
+
+?>
\ No newline at end of file
diff --git a/src/module_cadastre/web_service/class/majic_lib/Mj_Proprietaire.class.inc b/src/module_cadastre/web_service/class/majic_lib/Mj_Proprietaire.class.inc
new file mode 100755
index 0000000000000000000000000000000000000000..31455062cf478a7a56648ece5bc11f3d4635004d
--- /dev/null
+++ b/src/module_cadastre/web_service/class/majic_lib/Mj_Proprietaire.class.inc
@@ -0,0 +1,135 @@
+<?php
+/**
+* \file Mj_Proprietaire.class.inc
+* \brief Mj_Proprietaire.class.inc \n \n Ce fichier contient la classe php Mj_Proprietaire
+* 
+* Cette classe permet de s�lectionner les attributs n�cessaires afin de traiter la partie proprietaire.
+*
+* \author Damien Bedel <damien.bedel@veremes.com>
+* \author Olivier Gayte <olivier.gayte@veremes.com>
+*/
+/**
+* \class Mj_Proprietaire
+* \brief Mj_Proprietaire Class \n \n Mj_Proprietaire est une classe PHP qui h�rite de la classe Mj.
+*
+* Cette classe permet de s�lectionner les attributs n�cessaires afin de traiter la partie proprietaire.
+*
+* \author Damien Bedel <damien.bedel@veremes.com>
+* \author Olivier Gayte <olivier.gayte@veremes.com>
+*/
+require_once ("Mj.class.inc");
+
+class Mj_Proprietaire extends Mj {
+	/**
+	* Tableau associatif comportant la liste des objets Pev du b�ti
+	*/
+	var $aProprietaireNom=array();
+	
+	/**
+	* \param $sIdDnupro Identifiant National de compte communal
+	* \param $sIdPro Identifiant d'un propri�taire pour le d�partement et le CDIF
+	* \param $oBD Objet de connexion PDO_BD
+	*/
+	function __construct($sIdDnupro,$sIdPro,$oBD, $sEncryptedKey=''){
+		$this->sEncryptKey = $sEncryptedKey;
+		include $this->sRessourcesFile;
+		$this->sSql = $aSql[$oBD->sgbd]['proprietaire'];
+		$this->sSql= str_replace('$sIdDnupro', $this->encrypt($sIdDnupro),$this->sSql);
+		$this->sSql = str_replace('$sIdPro', $sIdPro, $this->sSql);
+		$oPDOresult= $oBD->execute($this->sSql);
+		
+		if ( $oBD->enErreur()) {
+		    $this->sStatus=1;
+		    $this->sMessage=$oBD->getBDMessage();    	
+		}else{
+			$this->aFields=$oBD->ligneSuivante ($oPDOresult);
+			$this->aFields['id_dnupro'] = $sIdDnupro;
+			$this->sStatus=0;
+		}
+		$oPDOresult = $oBD->fermeResultat();
+		
+		$this->aProprietaireNom = $this->getProprietaireNom();
+	}
+	/**
+	* Cette m�thode permet de construire un tableau correspondant au relev� de propri�t�.
+	* \return Retourne un tableau associatif correspondant au relev� de propri�t�.
+	*/
+	function getExportFields(){
+		$aExportFields=array();
+		if($this->isEmpty()){
+			$aExportFields="";
+		} 
+		else{
+			$aExportFields['l_ccodro']=$this->aFields['l_ccodro'];
+			$aExportFields['l_ccodem']=$this->aFields['l_ccodem'];
+			$aExportFields['dnuper']=$this->aFields['dnuper'];
+			$aExportFields['dnupro']=$this->aFields['dnupro'];
+			$aExportFields['proprietaire_nom']=$this->getProprietaireNom();
+			$aExportFields['proprietaire_nom_tiers']=$this->getProprietaireNomTiers();
+			$aExportFields['proprietaire_adresse']=$this->getProprietaireAdresse();
+			$aExportFields['jdatnss']=$this->getJdatnss();
+			$aExportFields['dldnss']=$this->getDldnss();
+		}
+		return $aExportFields;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer le nom du propri�taire en fonction de la valeur de l'attribut epxnee.
+	* \return Retourne une cha�ne de caract�res.
+	*/
+	function getProprietaireNom(){
+		switch($this->aFields["epxnee"]){
+			case 'EPX' : 
+				$sProprietaireNom = rtrim($this->aFields["dqualp"])." ".rtrim($this->aFields["ddenom"])." EP ".rtrim($this->aFields["dnomcp"])." ".rtrim($this->aFields["dprncp"]);
+				break;
+			case 'NEE' :
+				$sProprietaireNom = rtrim($this->aFields["dqualp"])." ".rtrim($this->aFields["ddenom"])." EP ".rtrim($this->aFields["dnomlp"])." ".rtrim($this->aFields["dprnlp"]);
+				break;
+			default : 
+				$sProprietaireNom = rtrim($this->aFields["dqualp"])." ".rtrim($this->aFields["ddenom"]);
+				break;
+		}
+		return $sProprietaireNom;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer l'adresse compl�te du propri�taire en concat�nant les attributs dlign3, dlign4, dlign5 et dlign6.
+	* \return Retourne une cha�ne de caract�res.
+	*/
+	function getProprietaireAdresse(){
+		$sProprietaireAdresse = rtrim($this->aFields['dlign3'])." ".ltrim(rtrim($this->aFields['dlign4']),'0')." ".rtrim($this->aFields['dlign5'])." ".rtrim($this->aFields['dlign6']);
+		return $sProprietaireAdresse;
+	}
+	/**
+	* Cette m�thode permet de concat�ner les attributs dnvoiri et indic.
+	* \return Retourne une cha�ne de caract�res. Elle est vide si l'attribut dqualp est vide.
+	*/
+	function getJdatnss(){
+		if($this->aFields["gtoper"]=='2'){
+			$sJdatnss = '';
+		}else{
+			$sJdatnss = "NE(E) le ".$this->aFields['jdatnss'];
+		}
+		return $sJdatnss;
+	}
+	/**
+	* Cette m�thode permet de concat�ner les attributs dnvoiri et indic.
+	* \return Retourne une cha�ne de caract�res. Elle est vide si l'attribut dqualp est vide.
+	*/
+	function getDldnss(){
+		if($this->aFields["gtoper"]=='2'){
+			$sJdatnss = '';
+		}else{
+			$sDldnss = "A ".$this->aFields['dldnss'];
+		}
+		return $sDldnss;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer le nom du propri�taire correspondant � un relev� de propri�t� destin� aux tiers.
+	* \return Retourne une cha�ne de caract�res.
+	*/
+	function getProprietaireNomTiers(){
+		$sProprietaireNomTiers = rtrim($this->aFields["dqualp"])." ".rtrim($this->aFields["ddenom"]);
+		return $sProprietaireNomTiers;
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/src/module_cadastre/web_service/class/majic_lib/Mj_Suf.class.inc b/src/module_cadastre/web_service/class/majic_lib/Mj_Suf.class.inc
new file mode 100755
index 0000000000000000000000000000000000000000..f68795311f10395b6f1eb636bae254ac4519c0a1
--- /dev/null
+++ b/src/module_cadastre/web_service/class/majic_lib/Mj_Suf.class.inc
@@ -0,0 +1,332 @@
+<?php
+/**
+* \file Mj_Suf.class.inc
+* \brief Mj_Suf.class.inc \n \n Ce fichier contient la classe php Mj_Suf
+* 
+* Cette classe permet de s�lectionner les attributs n�cessaires afin de traiter la partie Suf. 
+*
+* \author Fabien Marty <fabien.marty@veremes.com>
+* \author Damien Bedel
+* \author Olivier Gayte <olivier.gayte@veremes.com>
+*/
+/**
+* \class Mj_Suf
+* \brief Mj_Suf Class \n \n Mj_Suf est une classe PHP qui h�rite de la classe Mj.
+*
+* Cette classe permet de s�lectionner les attributs n�cessaires afin de traiter la partie Suf. 
+*
+* \author Fabien Marty <fabien.marty@veremes.com>
+* \author Damien Bedel
+* \author Olivier Gayte <olivier.gayte@veremes.com>
+*/
+require_once ("Mj.class.inc");
+require_once ("Mj_Exon_Suf.class.inc");
+
+class Mj_Suf extends Mj {
+	/**
+	* Tableau associatif comportant la liste des objets Exon_Suf d'une parcelle
+	*/
+	var $aExonSuf=array();
+	/**
+	* \param $oBD Objet de connexion PDO_BD
+	* \param $sIdSuf Identifiant de la suf
+	* \param $sIdDnupro Identifiant du propri�taire
+	*/
+	function __construct($oBD,$sIdSuf,$sIdDnupro,$sEncryptedKey='', $bAllSuf=false){
+		$this->bAllSuf = $bAllSuf;
+		$this->sEncryptKey = $sEncryptedKey;
+		include $this->sRessourcesFile;
+		// r�cup�ration du dnupro de la suf
+		$this->sSql=$aSql[$oBD->sgbd]['suf_dnupro'];
+		$this->sSql=str_replace('$sIdSuf', $sIdSuf, $this->sSql);
+		
+		$oPDOresult=$oBD->execute($this->sSql);
+		if ($oBD->enErreur()){
+			$this->sStatus=1;
+			$this->sMessage=$oBD->getBDMessage();
+			$this->sSql=$aSql['suf'];
+		}else{
+			$this->sStatus=0;
+			$aSufPar=$oBD->ligneSuivante ($oPDOresult);
+			// Si le DNUPRO de la suf est diff�rent de la parcelle il s'agit d'une parcelle concern�e par des lots en biens non d�limit�s
+			if (trim($aSufPar['dnupro'])==trim(substr($sIdDnupro,6))){
+				$this->sSql=$aSql[$oBD->sgbd]['suf'];
+			}else{
+				if($this->bAllSuf){
+					$this->sSql=$aSql[$oBD->sgbd]['suf_bnd_all'];
+				}else{
+					$this->sSql=$aSql[$oBD->sgbd]['suf_bnd'];
+				}
+			}
+		}
+		$this->sSql=str_replace('$sIdSuf', $sIdSuf, $this->sSql);
+		$this->sSql=str_replace('sIdDnupro', substr($sIdDnupro, 5), $this->sSql);
+		$oPDOresult=$oBD->execute($this->sSql);
+		if ($oBD->enErreur()){
+			$this->sStatus=1;
+			$this->sMessage=$oBD->getBDMessage();
+		}else{
+			$this->aFields=$oBD->ligneSuivante ($oPDOresult);
+			$this->sStatus=0;
+		}
+		$this->aExonSuf=$this->get_aExon_Suf($oBD);
+		if ($this->aFields['dnulot']){
+			$this->aPro=$this->get_aPro($oBD);
+			$this->aObjects = array_merge ($this->aPro,$this->aExonSuf);
+		}else{
+			$this->aObjects=$this->aExonSuf;
+		}
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer les ID_PRO en fonction d'un ID_DNUPRO donn�.
+	* \return Retourne un tableau de ID_PRO.
+	*/
+	function get_aId_Pro($oBD){
+		if($this->isEmpty()){
+			$aIdPro="";
+		}else{
+			include $this->sRessourcesFile;
+			$aIdPro=array();
+			$this->sSql = $aSql[$oBD->sgbd]['get_id_pro'];
+			$this->sSql = str_replace('$sIdDnupro', $this->encrypt($this->aFields['id_dnupro']), $this->sSql);
+			$oPDOresult= $oBD->execute($this->sSql);
+			if ( $oBD->enErreur()) {
+				$this->sStatus=1;
+				$this->sMessage = $oBD->getBDMessage();
+			}else{
+				while($aResultFetch = $oBD->tableauSuivant ($oPDOresult)){
+					array_push($aIdPro,$aResultFetch[0]);
+					$this->sStatus=0;
+				}
+			}
+		}
+		return $aIdPro;
+		$oPDOresult=$oBD->fermeResultat();
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer la liste des objets Proprietaire
+	* \param $oBD Objet de connexion PDO_BD
+	* \return Retourne un tableau d'objets Proprietaire
+	*/
+	function get_aPro($oBD){
+		$aPro=array();
+		if($this->isEmpty()){
+			$aPro="";
+		}else{
+			$aIdPro = $this->get_aId_Pro($oBD);
+			foreach($aIdPro as $sIdPro){
+				array_push($aPro,new Mj_Proprietaire($this->encrypt($this->aFields['id_dnupro']),$sIdPro,$oBD));
+			}
+		}
+		return $aPro;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer les Rnuexn en fonction d'un Id_Suf donn�
+	* \return Retourne un tableau de cha�ne de caract�res.
+	*/
+	function get_aRnuexn($oBD){
+		if($this->isEmpty()){
+			$aRnuexn="";
+		}else{
+			include $this->sRessourcesFile;
+			$aRnuexn=array();
+			$this->sSql=$aSql[$oBD->sgbd]['get_rnuexn'];
+			$this->sSql=str_replace('$sIdSuf', $this->aFields['id_suf'], $this->sSql);
+			$oPDOresult=$oBD->execute($this->sSql);
+			if ($oBD->enErreur()){
+				$this->sStatus=1;
+				$this->sMessage=$oBD->getBDMessage();
+			}else{
+				while($aResultFetch = $oBD->tableauSuivant ($oPDOresult)){
+					array_push($aRnuexn,$aResultFetch[0]);
+					$this->sStatus=0;
+				}
+			}
+		}
+		return $aRnuexn;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer la liste des objets Exon_Suf d'une parcelle
+	* \return Retourne un tableau d'objets Exon_Suf
+	*/
+	function get_aExon_Suf($oBD){
+		$aExonSuf=array();
+		if($this->isEmpty()){
+			$aExonSuf="";
+		}else{
+			$aRnuexn=$this->get_aRnuexn($oBD);
+			foreach($aRnuexn as $sRnuexn){
+				array_push($aExonSuf,new Mj_Exon_Suf($this->aFields['id_suf'],$sRnuexn,$oBD));
+			}
+		}
+		return $aExonSuf;
+	}
+
+	/**
+	* Cette m�thode permet de construire un tableau correspondant au relev� de propri�t�.
+	* \return Retourne un tableau associatif correspondant au relev� de propri�t�.
+	*/
+	function getExportFields(){
+		$aExportFields=array();
+		if($this->isEmpty()){
+			$aExportFields="";
+		}else{
+			$aExportFields['dnupro']=$this->aFields['dnupro'];
+			$aExportFields['id_dnupro']=$this->aFields['id_dnupro'];
+			$aExportFields['s_tar']=$this->aFields['ccostn'];
+			$aExportFields['suf']=$this->aFields['ccosub'];
+			$aExportFields['gnexps']=$this->aFields['gnexps'];
+			$aExportFields['grss_gr']=$this->aFields['dsgrpf'];
+			$aExportFields['occupation']=$this->aFields['l_dsgrpf'];
+			$aExportFields['nature']=$this->aFields['l_dsgrpf'];
+			$aExportFields['groupe']=$this->aFields['l_cgrnum'];
+			$aExportFields['clas']=$this->aFields['dclssf'];
+			$aExportFields['nat_cult']=$this->aFields['cnatsp'];
+			$aExportFields['ha']=$this->getContenanceHA();
+			if ($aExportFields['ha'] == 0){
+				$aExportFields['ha']=' ';
+			}
+			$aExportFields['a']=$this->getContenanceA();
+			$sContenanceA=$aExportFields['a'];
+			$sContenanceA= strval($sContenanceA);
+			$sTlenA=strlen($sContenanceA);
+			if ($aExportFields['ha'] == ' ' and $aExportFields['a'] == 0){
+				$aExportFields['a']=' ';
+			}else{
+				if ($aExportFields['ha'] == ' ' and $sTlenA == 2 and (substr($aExportFields['a'],0,1)== 0)){
+					$sDeuxiemeValeur= substr($aExportFields['a'],1,1);
+					$aExportFields['a']= ' '.$sDeuxiemeValeur;
+				}else{
+					if ($aExportFields['ha'] != ' ' and $sTlenA == 1){
+						$aExportFields['a']='0'.$aExportFields['a'];
+					}
+				}
+			}
+			$aExportFields['ca']=$this->getContenanceCA();
+			$sContenanceCa=$aExportFields['ca'];
+			$sContenanceCa=strval($sContenanceCa);
+			$sTlen=strlen($sContenanceCa);
+			if ($aExportFields['a'] != 0)
+				if ($sTlen == 1){
+					$aExportFields['ca']='0'.$aExportFields['ca'];
+				}
+			$aExportFields['revenu_cadastral']=$this->getRevenuCadastral();
+			$aExportFields['revenu_cadastral_txt']=$this->setFloatToText($this->getRevenuCadastral());
+			$aExportFields['revenu_cadastral_exo']=$this->getRevenuCadastralExo($sCollectivite);
+			$aExportFields['revenu_reference']=$this->getRevenuReference();
+			$aExportFields['revenu_reference_txt']=$this->setFloatToText($this->getRevenuReference());
+			$aExportFields['nat_exo']=$this->getNatExo();
+			$aExportFields['ccolloc']=$this->getCcolloc($sCollectivite);
+			$aExportFields['contenance_suf']=$this->getContenance();
+			if ($this->aFields['dnulot']){
+				$aExportFields['num_voirie']='*****';
+				$aExportFields['dnulot']=$this->aFields['dnulot'];
+				$aExportFields['dnupdl']=$this->aFields['dnupdl'];
+				$aExportFields['dnumql']=$this->aFields['dnumql'];
+				$aExportFields['ddenql']=$this->aFields['ddenql'];
+			}
+		}
+		return $aExportFields;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer les caract�res correspondants � la colonne HA depuis l'attribut dcntsf.
+	* \return Retourne une cha�ne de caract�res.
+	*/
+	function getContenanceHA(){
+		$sContenanceHA=$this->aFields['dcntsf'];
+		$sContenanceHA=substr("$sContenanceHA",0,5);
+		$iContenanceHA= (int) $sContenanceHA;
+		return $iContenanceHA;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer les caract�res correspondants � la colonne A depuis l'attribut dcntsf.
+	* \return Retourne une cha�ne de caract�res.
+	*/
+	function getContenanceA(){
+		$sContenanceA=$this->aFields['dcntsf'];
+		$sContenanceA=substr("$sContenanceA", 5, 2);
+		return $sContenanceA;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer les caract�res correspondants � la colonne CA depuis l'attribut dcntsf.
+	* \return Retourne une cha�ne de caract�res.
+	*/
+	function getContenanceCA(){
+		$sContenanceCA=$this->aFields['dcntsf'];
+		$sContenanceCA=substr("$sContenanceCA", 7, 2);
+		return $sContenanceCA;
+	}
+	/*
+	* Cette m�thode permet de r�cup�rer la contenance totale d'une suf.
+	* \return Retourne un entier.
+	*/
+	function getContenance(){
+		$iContenanceHA = (int) $this->getContenanceHA();
+		$iContenanceA = (int) $this->getContenanceA();
+		$iContenanceCA = (int) $this->getContenanceCA();
+		$iContenance = ($iContenanceHA*10000)+($iContenanceA*100)+($iContenanceCA);
+		return $iContenance;
+	}
+	/**
+	* Cette m�thode permet de diviser l'attribut drcsuba par 100.
+	* \return Retourne un float.
+	*/
+	function getRevenuCadastral(){
+		$fRevenuCadastral=floatval($this->aFields['drcsuba']);
+		$fRevenuCadastral=$fRevenuCadastral/100;
+		return $fRevenuCadastral;
+	}
+	/**
+	* Cette m�thode permet de diviser l'attribut drcsub par 100.
+	* \return Retourne un float.
+	*/
+	function getRevenuReference(){
+		$fRevenuReference=floatval($this->aFields['drcsub']);
+		$fRevenuReference=$fRevenuReference/100;
+		return $fRevenuReference;
+	}
+
+	/**
+	* Cette m�thode permet de diviser l'attribut rcexnba par 100.
+	* \return Retourne un float.
+	*/
+	function getRevenuCadastralExo($sCollectivite){
+		foreach($this->aExonSuf as $aFieldsRevExo) {
+			if (rtrim($aFieldsRevExo->aFields['ccolloc']) == $sCollectivite) {
+				$fRevenuCadastral=floatval($aFieldsRevExo->aFields['rcexnba']);
+				$fRevenuCadastral=$fRevenuCadastral/100;
+			}
+		}
+		return $fRevenuCadastral;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer la valeur de l'attribut 'nat_exo' du tableau aExonSuf.
+	* \return Retourne une cha�ne de caract�res.
+	*/
+	function getNatExo(){
+		return $this->aExonSuf[0]->aFields['gnexts'];
+	}
+	/** 
+	* Cette m�thode permet de r�cup�rer la valeur de l'attribut 'ccolloc' du tableau aExonSuf.
+	* \return Retourne une cha�ne de caract�res.
+	*/
+	function getCcolloc($sCollectivite){
+		$bVal=false;
+		foreach($this->aExonSuf as $aFieldsExo) {
+			if(rtrim($aFieldsExo->aFields['ccolloc']) == $sCollectivite) {
+				$aReturn=$aFieldsExo;
+				$bVal=true;
+			}
+		}
+		return $bVal;
+	}
+	/**
+	* Cette m�thode permet de formater un d�cimal pour l'affichage.
+	* \return Retourne une chaine
+	*/
+	function setFloatToText($fFloat){
+		return number_format($fFloat,2,'.','');
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/src/module_cadastre/web_service/class/majic_lib/xsl/FP.xslt b/src/module_cadastre/web_service/class/majic_lib/xsl/FP.xslt
new file mode 100755
index 0000000000000000000000000000000000000000..64881b2790eef9e028ee40ed5f818ad271fb38d8
--- /dev/null
+++ b/src/module_cadastre/web_service/class/majic_lib/xsl/FP.xslt
@@ -0,0 +1,1481 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE xsl:stylesheet [
+  <!ENTITY nbsp "&#160;">
+]>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  <xsl:output method="html" encoding="utf-8" doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
+  <xsl:template match="/">
+    <xsl:param name="poste"/>
+    <xsl:param name="type"/>
+
+    <html xmlns="http://www.w3.org/1999/xhtml"
+      lang="fr"
+      >
+      <head>
+        <style type="text/css">
+          body {
+          font-family:arial, "sans-serif";
+          padding:100px 20px 20px 20px;
+          background-image:url(http://img15.hostingpics.net/pics/500812bandeau.jpg);
+          background-repeat:no-repeat;
+          background-position:center top;
+          }
+
+          hr {
+          text-align: center;
+          width:100%;
+          color:#F1B4B4;
+          }
+
+          table {
+          text-align:left;
+          width:100%;
+          font-size:12px;
+          margin-bottom:35px;
+          }
+
+          td {
+          text-align:left;
+
+          background-color:#F7F7F7 ;
+          }
+
+          h1 {
+          font-family:tahoma;
+          color: #008393;
+          }
+
+          th {
+          text-align:left;
+
+          background-color:#eeeeee;
+          }
+
+          h4 {
+          font-family:tahoma;
+          color: #990000;
+          }
+
+          h5 {
+          font-family:tahoma;
+          }
+        </style>
+      </head>
+      <body>
+        <hr size="5"/>
+        <h1>
+          <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle">
+            Parcelle <xsl:value-of select="@section" /><xsl:value-of select="format-number(@num_parc, '0000')"/>
+          </xsl:for-each>
+        </h1>
+        <hr size="10"/>
+        <Table cellspacing="2" cellpadding="5" >
+          <TR>
+            <TH align="left" width ="15%">
+              Adresse :
+            </TH>
+            <TD align="left" width ="85%">
+              <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle">
+                <xsl:value-of select="@num_voirie" />
+                <xsl:text disable-output-escaping="yes">&amp;nbsp;</xsl:text>
+                <xsl:value-of select="@adresse" />
+              </xsl:for-each>
+            </TD>
+          </TR>
+          <TR>
+            <TH align="left" width ="15%">
+              Commune :
+            </TH>
+            <TD align="left" width ="85%">
+              <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle">
+                <xsl:value-of select="@libcom" />
+              </xsl:for-each>
+            </TD>
+          </TR>
+          <TR>
+            <TH align="left" width ="15%">
+              Code Commune (Insee) :
+            </TH>
+            <TD align="left" width ="85%">
+              <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle">
+                <xsl:value-of select="@codeinsee" />
+              </xsl:for-each>
+            </TD>
+          </TR>
+          <TR>
+            <TH align="left" width ="15%">
+              Compte Propriétaire :
+            </TH>
+            <TD align="left" width ="85%">
+              <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle">
+                <xsl:value-of select="Mj_Parcelle/@dnupro" />
+                <BR/>
+              </xsl:for-each>
+            </TD>
+          </TR>
+          <TR>
+            <TH align="left" width ="15%">
+              Surface cadastrale (m²) :
+            </TH>
+            <TD align="left" width ="85%">
+              <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle">
+                <xsl:value-of select="@total_contenance_m2" />
+              </xsl:for-each>
+            </TD>
+          </TR>
+          <xsl:if test="not($type='restreint')">
+            <TR>
+              <TH align="left" width ="15%">
+                Urbaine :
+              </TH>
+              <TD align="left" width ="85%">
+                <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle">
+                  <xsl:value-of select="@gurbpa" />
+                </xsl:for-each>
+              </TD>
+            </TR>
+            <TR>
+              <TH align="left" width ="15%">
+                Bâtie :
+              </TH>
+              <TD align="left" width ="85%">
+                <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle">
+                  <xsl:value-of select="@gparbat" />
+                </xsl:for-each>
+              </TD>
+            </TR>
+            <TR>
+              <TH align="left" width ="15%">
+                Parcelle primitive :
+              </TH>
+              <TD align="left" width ="85%">
+                <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle">
+                  <xsl:if test="not(@num_parc_prim = '')">
+                    <xsl:value-of select="@num_parc_prim" />
+                  </xsl:if>
+                  <xsl:if test="@num_parc_prim = ''">
+                    -
+                  </xsl:if>
+                </xsl:for-each>
+              </TD>
+            </TR>
+          </xsl:if>
+        </Table>
+        <xsl:if test="$poste='internet'">
+          <img>
+            <xsl:attribute name="src">http://mapsrv.rgd74.fr/geomap70/mg/net/ggGetMapImage.aspx?USER=Administrator&amp;PWD=admin&amp;MAPNAME=Library://RISNET_GESTION/Cartes/RGD 73-74 - RISNET_GESTION_73_74.MapDefinition&amp;SELOBJS=PARCELLE%2C<xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle">
+                <xsl:value-of select='substring(@idpar,1,2)'/>
+                <xsl:value-of select='substring(@idpar,4,3)'/>
+                <xsl:if test ="substring(@idpar,7,3)='000'">
+                  <xsl:text disable-output-escaping="yes">---</xsl:text>
+                </xsl:if>
+                <xsl:if test ="not(substring(@idpar,7,3)='000')">
+                  <xsl:value-of select='substring(@idpar,7,3)'/>
+                </xsl:if>
+                <xsl:if test ="substring(@idpar,10,1)='0'">
+                  <xsl:text disable-output-escaping="yes">-</xsl:text>
+                </xsl:if>
+                <xsl:if test ="not(substring(@idpar,10,1)='0')">
+                  <xsl:value-of select='substring(@idpar,10,1)'/>
+                </xsl:if>
+                <xsl:value-of select='substring(@idpar,11,1)'/>
+                <xsl:value-of select='substring(@idpar,12)'/>
+              </xsl:for-each>-&amp;CENTERX=&amp;CENTERY=&amp;SCALE=*8&amp;HEIGHT=400&amp;WIDTH=575&amp;RESULTTYPE=JPG</xsl:attribute>
+          </img>
+          <h4>
+            Urbanisme : POS/PLU
+          </h4>
+          <Table cellspacing="2" cellpadding="5">
+            <TR>
+              <TH>
+                Zonage
+              </TH>
+              <TH>
+                Libellé
+              </TH>
+              <TH>
+                Surface (m²)*
+              </TH>
+              <TH>
+                COS
+              </TH>
+              <TH>
+                CES
+              </TH>
+              <TH>
+                Hauteur
+              </TH>
+              <TH>
+                Réglement de la zone
+              </TH>
+            </TR>
+            <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle/Mj_PosPlu">
+              <TR>
+                <TD>
+                  <xsl:value-of select="@zonage" />&nbsp;
+                </TD>
+                <TD>
+                  <xsl:value-of select="@lib_zonage" />&nbsp;
+                </TD>
+                <TD>
+                  <xsl:value-of select="@surface" />&nbsp;
+                </TD>
+                <TD>
+                  <xsl:value-of select="@cos" />&nbsp;
+                </TD>
+                <TD>
+                  <xsl:value-of select="@ces" />&nbsp;
+                </TD>
+                <TD>
+                  <xsl:value-of select="@hauteur" /> &nbsp;
+                </TD>
+                <TD>
+                  <a>
+                    <xsl:attribute name="href">http://mapris.rgd74.fr/DocumentsPartenaires/Reglement_POS/<xsl:value-of select="@idreg" />.pdf</xsl:attribute>Consulter le réglement
+                  </a> &nbsp;
+                </TD>
+              </TR>
+            </xsl:for-each>
+          </Table>
+          <h6>*calcul sur la surface graphique, exclusion si surface &#139; 2 m² </h6>
+          <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle/Mj_PosPlu">
+            <a>
+              <xsl:attribute name="href">http://mapris.rgd74.fr/Risnet_Gestion/Application/Rapport/etat_pos_plu/fiche_pos.asp?codcom=<xsl:value-of select="@codecom" /></xsl:attribute>Avancement de l'actualisation/mise en ligne du POS/PLU de cette commune
+            </a> &nbsp;
+          </xsl:for-each>
+        </xsl:if>
+        <xsl:if test="not($type='sansnom')">
+          <hr size="5"/>
+          <h4>
+            Propriétaire(s) de la parcelle
+          </h4>
+          <h6>*Cliquer sur le n° de compte pour accéder à son relevé de propriété </h6>
+          <Table cellspacing="2" cellpadding="5">
+            <TR>
+              <TH colspan="2">
+                Compte
+              </TH>
+              <TH>
+                Nom
+              </TH>
+              <xsl:if test="$type='complet'">
+                <TH>
+                  Etat Civil
+                </TH>
+              </xsl:if>
+              <TH>
+                Adresse
+              </TH>
+              <TH>
+                Type
+              </TH>
+            </TR>
+            <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Proprietaire">
+              <TR>
+                <TD colspan="2">
+                  <xsl:if test="$type='complet'">
+                    <a>
+                      <xsl:attribute name="href">http://ns227471.ovh.net/rgd/rgdservices.phtml?operation=GetReleveprop&amp;compte=<xsl:value-of select="@dnupro"/>&amp;type=complet&amp;format=pdf&amp;version=1.0</xsl:attribute><xsl:value-of select="@dnupro" />
+                    </a>
+                  </xsl:if>
+                  <xsl:if test="$type='restreint'">
+                    <a>
+                      <xsl:attribute name="href">http://ns227471.ovh.net/rgd/rgdservices.phtml?operation=GetReleveprop&amp;compte=<xsl:value-of select="@dnupro"/>&amp;type=restreint&amp;format=pdf&amp;version=1.0</xsl:attribute><xsl:value-of select="@dnupro" />
+                    </a>
+                  </xsl:if>
+                  <xsl:if test="$type='sansnom'">
+                    <xsl:value-of select="@dnupro" />&nbsp;
+                  </xsl:if>
+                </TD>
+                <TD>
+                  <xsl:if test="$type='complet'">
+                    <xsl:value-of select="@proprietaire_nom" />&nbsp;
+                  </xsl:if>
+                  <xsl:if test="$type='restreint'">
+                    <xsl:value-of select="@proprietaire_nom_tiers" />&nbsp;
+                  </xsl:if>
+                </TD>
+                <xsl:if test="$type='complet'">
+                  <TD>
+                    <xsl:value-of select="@jdatnss" />
+                    <BR/>
+                    <xsl:value-of select="@dldnss" />&nbsp;
+                  </TD>
+                </xsl:if>
+                <TD>
+                  <xsl:value-of select="@proprietaire_adresse" />&nbsp;
+                </TD>
+                <TD>
+                  <xsl:value-of select="@l_ccodro" /> &nbsp;
+                </TD>
+              </TR>
+              <xsl:if test ="..//Mj_Parcelle/Mj_Suf/Mj_Proprietaire[@dnupro]">
+                <tr>
+                  <th colspan="6">
+                    Détail
+                  </th>
+                </tr>
+                <TR>
+                  <TH>
+                    Numéro du lot
+                  </TH>
+                  <TH>
+                    Compte
+                  </TH>
+                  <TH>
+                    Nom
+                  </TH>
+                  <xsl:if test="$type='complet'">
+                    <TH>
+                      Etat Civil
+                    </TH>
+                  </xsl:if>
+                  <TH>
+                    Adresse
+                  </TH>
+                  <TH>
+                    Type
+                  </TH>
+                </TR>
+                <xsl:for-each select="../Mj_Parcelle/Mj_Suf/Mj_Proprietaire">
+                  <tr>
+                    <td>
+                      <xsl:value-of select="../@dnulot" /> &nbsp;
+                    </td>
+                    <td>
+                      <xsl:if test="$type='complet'">
+                        <a>
+                          <xsl:attribute name="href">http://ns227471.ovh.net/rgd/rgdservices.phtml?operation=GetReleveprop&amp;compte=<xsl:value-of select="@dnupro"/>&amp;type=complet&amp;format=pdf&amp;version=1.0</xsl:attribute><xsl:value-of select="@dnupro" />
+                        </a>
+                      </xsl:if>
+                      <xsl:if test="$type='restreint'">
+                        <a>
+                          <xsl:attribute name="href">http://ns227471.ovh.net/rgd/rgdservices.phtml?operation=GetReleveprop&amp;compte=<xsl:value-of select="@dnupro"/>&amp;type=restreint&amp;format=pdf&amp;version=1.0</xsl:attribute><xsl:value-of select="@dnupro" />
+                        </a>
+                      </xsl:if>
+                      <xsl:if test="$type='sansnom'">
+                        <xsl:value-of select="@dnupro" />&nbsp;
+                      </xsl:if>
+                    </td>
+                    <td>
+                      <xsl:if test="$type='complet'">
+                        <xsl:value-of select="@proprietaire_nom" />&nbsp;
+                      </xsl:if>
+                      <xsl:if test="$type='restreint'">
+                        <xsl:value-of select="@proprietaire_nom_tiers" />&nbsp;
+                      </xsl:if>
+                    </td>
+                    <xsl:if test="$type='complet'">
+                    <td>
+                        <xsl:value-of select="@jdatnss" />
+                        <BR/>
+                        <xsl:value-of select="@dldnss" />&nbsp;   
+                    </td>
+                    </xsl:if>
+                    <td>
+                      <xsl:value-of select="@proprietaire_adresse" />&nbsp;
+                    </td>
+                    <td>
+                      <xsl:value-of select="@l_ccodro" /> &nbsp;
+                    </td>
+                  </tr>
+                </xsl:for-each>
+              </xsl:if>
+            </xsl:for-each>
+          </Table>
+        </xsl:if>
+        <hr size="5"/>
+        <h4>
+          Subdivision(s) fiscale(s)
+        </h4>
+        <Table cellspacing="2" cellpadding="5">
+          <TR>
+            <TH>
+              Lettre
+            </TH>
+            <TH>
+              Groupe
+            </TH>
+            <TH>
+              Nature
+            </TH>
+            <TH>
+              Classe
+            </TH>
+            <TH>
+              Compte
+            </TH>
+            <TH>
+              Surface (m²)
+            </TH>
+            <xsl:if test="not($type='restreint')">
+              <TH>
+                Revenu (€)
+              </TH>
+            </xsl:if>
+            <TH>
+              Référence
+            </TH>
+          </TR>
+          <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle/Mj_Suf">
+            <TR>
+              <TD>
+                <xsl:if test="not(@suf = '')">
+                  <xsl:value-of select="@suf" />&nbsp;
+                </xsl:if>
+                <xsl:if test="@suf = ''">
+                  -
+                </xsl:if>
+              </TD>
+              <TD>
+                <xsl:if test="not(@groupe = '')">
+                  <xsl:value-of select="@groupe" />&nbsp;
+                </xsl:if>
+                <xsl:if test="@groupe = ''">
+                  -
+                </xsl:if>
+              </TD>
+              <TD>
+                <xsl:if test="not(@nature = '')">
+                  <xsl:value-of select="@nature" />&nbsp;
+                </xsl:if>
+                <xsl:if test="@nature = ''">
+                  -
+                </xsl:if>
+              </TD>
+              <TD>
+                <xsl:if test="not(@clas = '')">
+                  <xsl:value-of select="@clas" />&nbsp;
+                </xsl:if>
+                <xsl:if test="@clas = ''">
+                  -
+                </xsl:if>
+              </TD>
+              <TD>
+                <xsl:value-of select="@dnupro" />&nbsp;
+              </TD>
+              <TD>
+                <xsl:value-of select="@contenance_suf" />&nbsp;
+              </TD>
+              <xsl:if test="not($type='restreint')">
+                <TD>
+                  <xsl:value-of select="@revenu_cadastral_txt" />&nbsp;
+                </TD>
+              </xsl:if>
+              <TD>
+                <xsl:value-of select="@revenu_reference_txt" />&nbsp;
+              </TD>
+            </TR>
+          </xsl:for-each>
+        </Table>
+        <xsl:if test="not($type='sansnom')">
+          <xsl:if test="count(Mj/Mj_Compte_Communal_Parcelle/Mj_Bati) &gt; 0">
+            <hr size="5"/>
+            <h4>
+              Elément(s) bâti(s)
+            </h4>
+            <xsl:if test="$type='complet'">
+              <h6>*Cliquer sur la référence du local pour accéder à sa description</h6>
+            </xsl:if>
+            <Table cellspacing="2" cellpadding="5">
+              <TR>
+                <TH>
+                  Ref. local
+                </TH>
+                <TH>
+                  Nature
+                </TH>
+                <TH>
+                  <xsl:if test="$type='restreint'">
+                    Etages
+                  </xsl:if>
+                  <xsl:if test="$type='complet'">
+                    Date mutation
+                  </xsl:if>
+                </TH>
+                <TH>
+                  Propriétaire(s)
+                </TH>
+              </TR>
+              <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Bati">
+                <xsl:for-each select="Mj_Proprietaire">
+                  <TR>
+                    <xsl:if test="position()='1'">
+                      <TD>
+                        <xsl:if test="$type='restreint'">
+                          <xsl:value-of select="../@num_invar" />
+                        </xsl:if>
+                        <xsl:if test="$type='complet'">
+                          <a href="#{../@num_invar}">
+                            <xsl:value-of select="../@num_invar" />
+                          </a>&nbsp;
+                        </xsl:if>
+                      </TD>
+                      <TD>
+                        <xsl:value-of select="../@lib_nature" />&nbsp;
+                      </TD>
+                      <TD>
+                        <xsl:if test="$type='restreint'">
+                          <xsl:value-of select="../@niv" />&nbsp;
+                        </xsl:if>
+                        <xsl:if test="$type='complet'">
+                          <xsl:value-of select="../@date_mut" />&nbsp;
+                        </xsl:if>
+                      </TD>
+                    </xsl:if>
+                    <xsl:if test="position() &gt; '1'">
+                      <TD>
+                      </TD>
+                      <TD>
+                      </TD>
+                      <TD>
+                      </TD>
+                    </xsl:if>
+                    <TD>
+                      <xsl:if test="$type='restreint'">
+                        <xsl:value-of select="@dnupro" />&nbsp;
+                      </xsl:if>
+                      <xsl:if test="$type='complet'">
+                        <xsl:value-of select="@proprietaire_nom" />&nbsp;
+                      </xsl:if>
+                    </TD>
+                  </TR>
+                </xsl:for-each>
+              </xsl:for-each>
+            </Table>
+          </xsl:if>
+          <!-- .........................................Propriétaire de Bâtis, mode restreint................................................. -->
+          <xsl:if test="$type='restreint'">
+            <hr size="5"/>
+            <h4>
+              Propriétaire(s) du local
+            </h4>
+
+            <Table cellspacing="2" cellpadding="5">
+              <TR>
+                <TH>
+                  Compte
+                </TH>
+                <TH>
+                  Nom
+                </TH>
+                <TH>
+                  Adresse
+                </TH>
+                <TH>
+                  Type
+                </TH>
+              </TR>
+              <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Bati/Mj_Proprietaire">
+                <TR>
+                  <TD>
+                    <a>
+                      <xsl:attribute name="href">http://ns227471.ovh.net/rgd/rgdservices.phtml?operation=GetReleveprop&amp;compte=<xsl:value-of select="@dnupro"/>&amp;type=restreint&amp;format=pdf&amp;version=1.0</xsl:attribute><xsl:value-of select="@dnupro" />
+                    </a>
+                  </TD>
+                  <TD>
+                    <xsl:value-of select="@proprietaire_nom" />&nbsp;
+                  </TD>
+                  <TD>
+                    <xsl:value-of select="@proprietaire_adresse" />&nbsp;
+                  </TD>
+                  <TD>
+                    <xsl:value-of select="@l_ccodro" />&nbsp;
+                  </TD>
+                </TR>
+              </xsl:for-each>
+            </Table>
+
+          </xsl:if>
+          <!-- .........................................Description du local, mode complet................................................. -->
+          <xsl:if test="$type='complet'">
+            <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Bati">
+              <hr size="15"/>
+              <h1>
+
+                <a name="{@num_invar}">
+                  Local n° <xsl:value-of select="@num_invar" />
+                </a>
+
+              </h1>
+              <hr size="10"/>
+              <Table cellspacing="2" cellpadding="5">
+                <TR>
+                  <TH align="left" width="39%">
+
+                  </TH>
+                  <TH align="left" width="40%">
+
+                  </TH>
+                  <TH align="center" width="7%">
+                    Bat
+                  </TH>
+                  <TH align="center" width="7%">
+                    Esc
+                  </TH>
+                  <TH align="center" width="7%">
+                    Etage
+                  </TH>
+                </TR>
+
+                <TR>
+                  <TH align="left" width="39%">
+                    Adresse :
+                  </TH>
+                  <TD align="left" width="40%">
+                    <xsl:value-of select="@voirie" />&nbsp;<xsl:value-of select="@adresse" />&nbsp;
+                  </TD>
+                  <TD align="center" width="7%">
+                    <xsl:value-of select="@bat" />&nbsp;
+                  </TD>
+                  <TD align="center" width="7%">
+                    <xsl:value-of select="@ent" />&nbsp;
+                  </TD>
+                  <TD align="center" width="7%">
+                    <xsl:value-of select="@niv" />&nbsp;
+                  </TD>
+                </TR>
+                <TR>
+                  <TH align="left" width="39%">
+                    Commune :
+                  </TH>
+                  <TD align="left" width="40%">
+                    <xsl:value-of select="@libcom" />&nbsp;
+                  </TD>
+                  <TD align="center" width="7%">
+
+                  </TD>
+                  <TD align="center" width="7%">
+
+                  </TD>
+                  <TD align="center" width="7%">
+
+                  </TD>
+                </TR>
+                <TR>
+                  <TH align="left" width="39%">
+                    Type :
+                  </TH>
+                  <TD align="left" width="40%">
+                    <xsl:value-of select="@dteloc" />&nbsp;
+                  </TD>
+                  <TD align="center" width="7%">
+
+                  </TD>
+                  <TD align="center" width="7%">
+
+                  </TD>
+                  <TD align="center" width="7%">
+
+                  </TD>
+                </TR>
+                <TR>
+                  <TH align="left" width="39%">
+                    Occupation :
+                  </TH>
+                  <TD align="left" width="40%">
+                    <xsl:value-of select="@lib_occupation" />&nbsp;
+                  </TD>
+                  <TD align="center" width="7%">
+
+                  </TD>
+                  <TD align="center" width="7%">
+
+                  </TD>
+                  <TD align="center" width="7%">
+
+                  </TD>
+                </TR>
+                <TR>
+                  <TH align="left" width="39%">
+                    Nature :
+                  </TH>
+                  <TD align="left" width="40%">
+                    <xsl:value-of select="@lib_nature" />&nbsp;
+                  </TD>
+                  <TD align="center" width="7%">
+
+                  </TD>
+                  <TD align="center" width="7%">
+
+                  </TD>
+                  <TD align="center" width="7%">
+
+                  </TD>
+                </TR>
+                <TR>
+                  <TH align="left" width="39%">
+                    Année de construction :
+                  </TH>
+                  <TD align="left" width="40%">
+                    <xsl:if test="not(@annee_constr = '0')">
+                      <xsl:value-of select="@annee_constr" />&nbsp;
+                    </xsl:if>
+                    <xsl:if test="@annee_constr = '0'">
+                      -
+                    </xsl:if>
+                  </TD>
+                  <TD align="center" width="7%">
+
+                  </TD>
+                  <TD align="center" width="7%">
+
+                  </TD>
+                  <TD align="center" width="7%">
+
+                  </TD>
+                </TR>
+                <TR>
+                  <TH align="left" width="39%">
+                    Date de mutation :
+                  </TH>
+                  <TD align="left" width="40%">
+                    <xsl:value-of select="@date_mut" />&nbsp;
+                  </TD>
+                  <TD align="center" width="7%">
+
+                  </TD>
+                  <TD align="center" width="7%">
+
+                  </TD>
+                  <TD align="center" width="7%">
+
+                  </TD>
+                </TR>
+                <TR>
+                  <TH align="left" width="39%">
+                    Valeur cadastrale (€) :
+                  </TH>
+                  <TD align="left" width="40%">
+                    <xsl:value-of select="Mj_Pev/@revenu_cadastral" />&nbsp;
+                  </TD>
+                  <TD align="center" width="7%">
+
+                  </TD>
+                  <TD align="center" width="7%">
+
+                  </TD>
+                  <TD align="center" width="7%">
+
+                  </TD>
+                </TR>
+                <TR>
+                  <TH align="left" width="39%">
+                    Niveaux :
+                  </TH>
+                  <TD align="left" width="40%">
+                    <xsl:value-of select="@niveaux" />&nbsp;
+                  </TD>
+                  <TD align="center" width="7%">
+
+                  </TD>
+                  <TD align="center" width="7%">
+
+                  </TD>
+                  <TD align="center" width="7%">
+
+                  </TD>
+                </TR>
+
+              </Table>
+              <hr size="5"/>
+              <h4>
+                Propriétaire(s) du local
+              </h4>
+              <Table cellspacing="2" cellpadding="5">
+                <TR>
+                  <TH>
+                    Compte
+                  </TH>
+                  <TH>
+                    Nom
+                  </TH>
+                  <TH>
+                    État Civil
+                  </TH>
+                  <TH>
+                    Adresse
+                  </TH>
+                  <TH>
+                    Type
+                  </TH>
+                </TR>
+
+                <xsl:for-each select="Mj_Proprietaire">
+                  <TR>
+                    <TD>
+                      <a>
+                        <xsl:attribute name="href">http://ns227471.ovh.net/rgd/rgdservices.phtml?operation=GetReleveprop&amp;compte=<xsl:value-of select="@dnupro"/>&amp;type=complet&amp;format=pdf&amp;version=1.0</xsl:attribute><xsl:value-of select="@dnupro" />
+                      </a>
+                    </TD>
+                    <TD>
+                      <xsl:value-of select="@proprietaire_nom" />&nbsp;
+                    </TD>
+                    <TD>
+                      <xsl:value-of select="@jdatnss" />
+                      <BR/>
+                      <xsl:value-of select="@dldnss" />&nbsp;
+                    </TD>
+                    <TD>
+                      <xsl:value-of select="@proprietaire_adresse" />&nbsp;
+                    </TD>
+                    <TD>
+                      <xsl:value-of select="@l_ccodro" />&nbsp;
+                    </TD>
+                  </TR>
+                </xsl:for-each>
+
+              </Table>
+              <hr size="5"/>
+              <h4>
+                P.E.V
+              </h4>
+              <Table cellspacing="2" cellpadding="5">
+                <TR>
+                  <TH>
+                    N°
+                  </TH>
+                  <TH>
+                    Nature
+                  </TH>
+                  <TH>
+                    Catégorie fiscale
+                  </TH>
+                  <TH>
+                    Série Tarif batie
+                  </TH>
+                  <TH>
+                    Local Type
+                  </TH>
+                  <TH>
+                    Val. Loc. Ref. (€)
+                  </TH>
+                  <TH>
+                    Val. Loc. Ann. (€)
+                  </TH>
+                  <TH>
+                    Nature exonération
+                  </TH>
+                </TR>
+
+                <xsl:for-each select="Mj_Pev">
+                  <TR>
+                    <TD>
+                      <xsl:if test="not(@num_pev = '')">
+                        <xsl:value-of select="@num_pev" />&nbsp;
+                      </xsl:if>
+                      <xsl:if test="@num_pev = ''">
+                        -
+                      </xsl:if>
+                    </TD>
+                    <TD>
+                      <xsl:if test="not(@l_nature = '')">
+                        <xsl:value-of select="@l_nature" />&nbsp;
+                      </xsl:if>
+                      <xsl:if test="@l_nature = ''">
+                        -
+                      </xsl:if>
+                    </TD>
+                    <TD>
+                      <xsl:if test="not(@cat = '')">
+                        <xsl:value-of select="@cat" />&nbsp;
+                      </xsl:if>
+                      <xsl:if test="@cat = ''">
+                        -
+                      </xsl:if>
+                    </TD>
+                    <TD>
+                      <xsl:if test="not(@s_tar = '')">
+                        <xsl:value-of select="@s_tar" />&nbsp;
+                      </xsl:if>
+                      <xsl:if test="@s_tar = ''">
+                        -
+                      </xsl:if>
+                    </TD>
+                    <TD>
+                      <xsl:if test="not(@local_type = '')">
+                        <xsl:value-of select="@local_type" />&nbsp;
+                      </xsl:if>
+                      <xsl:if test="@local_type = ''">
+                        -
+                      </xsl:if>
+                    </TD>
+                    <TD>
+                      <xsl:if test="not(@val_loc_ref = '')">
+                        <xsl:value-of select="@val_loc_ref" />&nbsp;
+                      </xsl:if>
+                      <xsl:if test="@val_loc_ref = ''">
+                        -
+                      </xsl:if>
+                    </TD>
+                    <TD>
+                      <xsl:if test="not(@val_loc_ann = '')">
+                        <xsl:value-of select="@val_loc_ann" />&nbsp;
+                      </xsl:if>
+                      <xsl:if test="@val_loc_ann = ''">
+                        -
+                      </xsl:if>
+                    </TD>
+                    <TD>
+                      <xsl:if test="not(@l_nat_exon = '')">
+                        <xsl:value-of select="@l_nat_exon" />&nbsp;
+                      </xsl:if>
+                      <xsl:if test="@l_nat_exon = ''">
+                        -
+                      </xsl:if>
+                    </TD>
+                  </TR>
+                </xsl:for-each>
+              </Table>
+
+              <xsl:if test ="Mj_Pev/Mj_Habit_Descr[@num_pev]">
+                <hr size="5"/>
+                <h4>
+                  Habitation principale
+                  <BR/>
+                </h4>
+                <h5>
+                  N° P.E.V : <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@num_pev" />
+                </h5>
+                <Table cellspacing="2" cellpadding="5">
+                  <TR>
+                    <TH width="30%">
+                      Divers
+                    </TH>
+                    <TH width="40%">
+                      Eléments de confort
+                    </TH>
+                    <TH width="10%">
+                      Pièces
+                    </TH>
+                    <TH width="20">
+                      Surfaces (m²)
+                    </TH>
+                  </TR>
+                  <TR>
+                    <TD width="30%">
+                      <Table cellspacing="2" cellpadding="5">
+                        <TR>
+                          <TD align ="left">
+                            Surface (m²) :
+                          </TD>
+
+                          <TD align ="right">
+                            <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@suf_piece_total" />&nbsp;
+                          </TD>
+
+                        </TR>
+                        <TR>
+                          <TD align ="left">
+                            Nbr pièces :
+                          </TD>
+
+                          <TD align ="right">
+                            <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_piece_total" />&nbsp;
+                          </TD>
+
+                        </TR>
+                        <TR>
+                          <TD align ="left">
+                            Nbr pièces princ. :
+                          </TD>
+
+                          <TD align ="right">
+                            <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_piece_principal" />&nbsp;
+                          </TD>
+
+                        </TR>
+                        <TR>
+                          <TD align ="left">
+                            Entretien :
+                          </TD>
+
+                          <TD align ="right">
+                            <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@l_Etat" />&nbsp;
+                          </TD>
+
+                        </TR>
+                        <TR>
+                          <TD align ="left">
+                            Année de Constr. :
+                          </TD>
+
+                          <TD align ="right">
+                            <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@annee_constr" />&nbsp;
+                          </TD>
+
+                        </TR>
+                        <TR>
+                          <TD align ="left">
+                            Nbr Niveaux :
+                          </TD>
+
+                          <TD align ="right">
+                            <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_niveaux" />&nbsp;
+                          </TD>
+
+                        </TR>
+                        <TR>
+                          <TD align ="left">
+                            Gros murs :
+                          </TD>
+
+                          <TD align ="right">
+                            <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@lib_mat_gros_mur" />&nbsp;
+                          </TD>
+
+                        </TR>
+                        <TR>
+                          <TD align ="left">
+                            Toitures :
+                          </TD>
+
+                          <TD align ="right">
+                            <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@lib_mat_toiture" />&nbsp;
+                          </TD>
+
+                        </TR>
+                      </Table>
+                    </TD>
+                    <TD width="40%">
+                      <Table cellspacing="2" cellpadding="5">
+                        <xsl:if test="Mj_Pev/Mj_Habit_Descr/@nb_baignoires &gt; 0">
+                          <TR>
+                            <TD align ="left">
+                              <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_baignoires" />&nbsp;
+                            </TD>
+                            <TD align ="left" width ="75%">
+                              Baignoire(s)
+                            </TD>
+                          </TR>
+                        </xsl:if>
+
+                        <xsl:if test="Mj_Pev/Mj_Habit_Descr/@nb_douches &gt; 0">
+                          <TR>
+                            <TD align ="left">
+                              <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_douches" />&nbsp;
+                            </TD>
+                            <TD align ="left" width ="75%">
+                              Douche(s)
+                            </TD>
+                          </TR>
+                        </xsl:if>
+
+                        <xsl:if test="Mj_Pev/Mj_Habit_Descr/@nb_lavabos &gt; 0">
+                          <TR>
+                            <TD align ="left">
+                              <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_lavabos" />&nbsp;
+                            </TD>
+                            <TD align ="left" width ="75%">
+                              Lavabo(s)
+                            </TD>
+                          </TR>
+                        </xsl:if>
+
+                        <xsl:if test="Mj_Pev/Mj_Habit_Descr/@nb_wc &gt; 0">
+                          <TR>
+                            <TD align ="left">
+                              <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_wc" />&nbsp;
+                            </TD>
+                            <TD align ="left" width ="75%">
+                              W.C.
+                            </TD>
+                          </TR>
+                        </xsl:if>
+                        
+                        
+                        <TR>
+                          <TD align ="left">
+                            Eau :
+                          </TD>
+                          <TD align ="left" width ="75%">
+                            <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@eau = 'EAU'">
+                              Oui
+                            </xsl:if>
+                            <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@eau = ''">
+                              -
+                            </xsl:if>
+                          </TD>
+                        </TR>
+                        <TR>
+                          <TD align ="left">
+                            Electricité :
+                          </TD>
+                          <TD align ="left" width ="75%">
+                            <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@elect = 'ELECT'">
+                              Oui
+                            </xsl:if>
+                            <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@elect = ''">
+                              -
+                            </xsl:if>
+                          </TD>
+                        </TR>
+                        <TR>
+                          <TD align ="left">
+                            Gaz :
+                          </TD>
+                          <TD align ="left" width ="75%">
+                            <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@gaz = 'GAZ'">
+                              Oui
+                            </xsl:if>
+                            <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@gaz = ''">
+                              -
+                            </xsl:if>
+                          </TD>
+                        </TR>
+                        <TR>
+                          <TD align ="left">
+                            Esc. de service :
+                          </TD>
+                          <TD align ="left" width ="75%">
+                            <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@esc_serv = 'ESC_SERV'">
+                              Oui
+                            </xsl:if>
+                            <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@esc_serv = ''">
+                              -
+                            </xsl:if>
+                          </TD>
+                        </TR>
+                        <TR>
+                          <TD align ="left">
+                            Ascenseur :
+                          </TD>
+                          <TD align ="left" width ="75%">
+                            <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@asc = 'ASC'">
+                              Oui
+                            </xsl:if>
+                            <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@asc = ''">
+                              -
+                            </xsl:if>
+                          </TD>
+                        </TR>
+                        <TR>
+                          <TD align ="left">
+                            Chauffage :
+                          </TD>
+                          <TD align ="left" width ="75%">
+                            <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@chauf = 'CHAUF'">
+                              Oui
+                            </xsl:if>
+                            <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@chauf = ''">
+                              -
+                            </xsl:if>
+                          </TD>
+                        </TR>
+                        <TR>
+                          <TD align ="left">
+                            Vide ordure :
+                          </TD>
+                          <TD align ="left" width ="75%">
+                            <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@vide_ord = 'VIDE_ORD'">
+                              Oui
+                            </xsl:if>
+                            <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@vide_ord = ''">
+                              -
+                            </xsl:if>
+                          </TD>
+                        </TR>
+                        <TR>
+                          <TD align ="left">
+                            Égout :
+                          </TD>
+                          <TD align ="left" width ="75%">
+                            <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@egout = 'EGOUT'">
+                              Oui
+                            </xsl:if>
+                            <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@egout = ''">
+                              -
+                            </xsl:if>
+                          </TD>
+                        </TR>
+                      </Table>
+                    </TD>
+                    <TD width="15%">
+                      <Table cellspacing="2" cellpadding="5">
+                        <TR>
+
+                          <TD align ="left">
+                            <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_sam" />&nbsp;
+                          </TD>
+
+                          <TD align ="left" width ="75%">
+                            S. a manger
+                          </TD>
+                        </TR>
+                        <TR>
+
+                          <TD align ="left">
+                            <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_chambre" />&nbsp;
+                          </TD>
+
+                          <TD align ="left" width ="75%">
+                            Chambre
+                          </TD>
+                        </TR>
+                        <TR>
+
+                          <TD align ="left">
+                            <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_cuisine_m9" />&nbsp;
+                          </TD>
+
+                          <TD align ="left" width ="75%">
+                            Cuisine (inf.9m2)
+                          </TD>
+                        </TR>
+                        <TR>
+
+                          <TD align ="left">
+                            <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_cuisine_p9" />&nbsp;
+                          </TD>
+
+                          <TD align ="left" width ="75%">
+                            Cuisine (sup.9m2)
+                          </TD>
+                        </TR>
+                        <TR>
+
+                          <TD align ="left">
+                            <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_salle_eau" />&nbsp;
+                          </TD>
+
+                          <TD align ="left" width ="75%">
+                            S. de bain
+                          </TD>
+                        </TR>
+                        <TR>
+
+                          <TD align ="left">
+                            <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_annexe" />&nbsp;
+                          </TD>
+
+                          <TD align ="left" width ="75%">
+                            Annexe
+                          </TD>
+                        </TR>
+                      </Table>
+                    </TD>
+                    <TD width="15%">
+                      <Table cellspacing="2" cellpadding="5">
+                        <TR>
+
+                          <TD align ="left">
+                            <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@suf_cave" />&nbsp;
+                          </TD>
+                          <TD align ="left" width ="75%">
+                            Cave(s)&nbsp;
+                          </TD>
+
+                        </TR>
+                        <TR>
+
+                          <TD align ="left">
+                            <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@suf_grenier" />&nbsp;
+                          </TD>
+                          <TD align ="left" width ="75%">
+                            Grenier(s)&nbsp;
+                          </TD>
+
+                        </TR>
+                        <TR>
+
+                          <TD align ="left">
+                            <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@suf_terrasse" />&nbsp;
+                          </TD>
+                          <TD align ="left" width ="75%">
+                            Terrasse(s)&nbsp;
+                          </TD>
+
+                        </TR>
+                        <TR>
+
+                          <TD align ="left">
+                            <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@suf_garage" />&nbsp;
+                          </TD>
+                          <TD align ="left" width ="75%">
+                            Garage(s)&nbsp;
+                          </TD>
+
+                        </TR>
+                      </Table>
+                    </TD>
+                  </TR>
+                </Table>
+              </xsl:if>
+              <xsl:if test ="Mj_Pev/Mj_Depend_Descr[@num_pev]">
+                <hr size="5"/>
+                <h4>
+                  Dépendance(s)
+                </h4>
+                <Table cellspacing="2" cellpadding="5">
+                  <TR>
+                    <TH>
+                      N°
+                    </TH>
+                    <TH>
+                      Nature
+                    </TH>
+                    <TH>
+                      Surface (m²)
+                    </TH>
+                    <TH>
+                      Pondération
+                    </TH>
+                    <TH>
+                      Entretien
+                    </TH>
+                    <TH>
+                      Gros murs
+                    </TH>
+                    <TH>
+                      Toitures
+                    </TH>
+                    <TH>
+                      Elt. confort
+                    </TH>
+                  </TR>
+                  <TR>
+
+                    <TD>
+                      <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@num_pev" />&nbsp;
+                    </TD>
+                    <TD>
+                      <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@nature" />&nbsp;
+                    </TD>
+                    <TD>
+                      <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@surface" />&nbsp;
+                    </TD>
+                    <TD>
+                      <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@ponderation" />&nbsp;
+                    </TD>
+                    <TD>
+                      <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@l_Etat" />&nbsp;
+                    </TD>
+                    <TD>
+                      <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@lib_mat_gros_mur" />&nbsp;
+                    </TD>
+                    <TD>
+                      <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@lib_mat_toiture" />&nbsp;
+                    </TD>
+
+                    <TD>
+                      <Table cellspacing="2" cellpadding="5">
+                        <xsl:if test="Mj_Pev/Mj_Depend_Descr/@nb_baignoires &gt; 0">
+                          <TR>
+                            <TD align ="left">
+                              <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@nb_baignoires" />&nbsp;
+                            </TD>
+                            <TD align ="left" width ="75%">
+                              Baignoire(s)
+                            </TD>
+                          </TR>
+                        </xsl:if>
+
+                        <xsl:if test="Mj_Pev/Mj_Depend_Descr/@nb_douches &gt; 0">
+                          <TR>
+                            <TD align ="left">
+                              <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@nb_douches" />&nbsp;
+                            </TD>
+                            <TD align ="left" width ="75%">
+                              Douche(s)
+                            </TD>
+                          </TR>
+                        </xsl:if>
+
+                        <xsl:if test="Mj_Pev/Mj_Depend_Descr/@nb_lavabos &gt; 0">
+                          <TR>
+                            <TD align ="left">
+                              <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@nb_lavabos" />&nbsp;
+                            </TD>
+                            <TD align ="left" width ="75%">
+                              Lavabo(s)
+                            </TD>
+                          </TR>
+                        </xsl:if>
+
+                        <xsl:if test="Mj_Pev/Mj_Depend_Descr/@nb_wc &gt; 0">
+                          <TR>
+                            <TD align ="left">
+                              <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@nb_wc" />&nbsp;
+                            </TD>
+                            <TD align ="left" width ="75%">
+                              W.C.
+                            </TD>
+                          </TR>
+                        </xsl:if>
+                        <TR>
+                          <TD align ="left">
+                            Eau :
+                          </TD>
+                          <TD align ="left" width ="75%">
+                            <xsl:if test ="Mj_Pev/Mj_Depend_Descr/@eau = 'EAU'">
+                              Oui
+                            </xsl:if>
+                            <xsl:if test ="Mj_Pev/Mj_Depend_Descr/@eau = ''">
+                              -
+                            </xsl:if>
+                          </TD>
+                        </TR>
+                        <TR>
+                          <TD align ="left">
+                            Chauffage :
+                          </TD>
+                          <TD align ="left" width ="75%">
+                            <xsl:if test ="Mj_Pev/Mj_Depend_Descr/@chauf = 'CHAUF'">
+                              Oui
+                            </xsl:if>
+                            <xsl:if test ="Mj_Pev/Mj_Depend_Descr/@chauf = ''">
+                              -
+                            </xsl:if>
+                          </TD>
+                        </TR>
+                        <TR>
+                          <TD align ="left">
+                            Electricité :
+                          </TD>
+                          <TD align ="left" width ="75%">
+                            <xsl:if test ="Mj_Pev/Mj_Depend_Descr/@elect = 'ELECT'">
+                              Oui
+                            </xsl:if>
+                            <xsl:if test ="Mj_Pev/Mj_Depend_Descr/@elect = ''">
+                              -
+                            </xsl:if>
+                          </TD>
+                        </TR>
+                      </Table>
+                    </TD>
+                  </TR>
+                </Table>
+              </xsl:if>
+              <xsl:if test ="Mj_Pev/Mj_Prof_Descr[@num_pev]">
+                <hr size="5"/>
+                <h4>
+                  Locaux Professionnels
+                </h4>
+                <Table cellspacing="2" cellpadding="5">
+                  <TR>
+                    <TH>
+                      N°
+                    </TH>
+                    <TH>
+                      Surface (m²)
+                    </TH>
+                  </TR>
+                  <TR>
+                    <TD>
+                      <xsl:value-of select="Mj_Pev/Mj_Prof_Descr/@num_pev" />
+                    </TD>
+                    <TD>
+                      <xsl:value-of select="Mj_Pev/Mj_Prof_Descr/@surface" />
+                    </TD>
+                  </TR>
+                </Table>
+              </xsl:if>
+            </xsl:for-each>
+          </xsl:if>
+        </xsl:if>
+      </body>
+    </html>
+  </xsl:template>
+</xsl:stylesheet>
+
diff --git a/src/module_cadastre/web_service/class/majic_lib/xsl/FP_New.xslt b/src/module_cadastre/web_service/class/majic_lib/xsl/FP_New.xslt
new file mode 100755
index 0000000000000000000000000000000000000000..89c143675d9771aebb2fb1e299becb364c81f141
--- /dev/null
+++ b/src/module_cadastre/web_service/class/majic_lib/xsl/FP_New.xslt
@@ -0,0 +1,1000 @@
+<?xsl version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE xsl:stylesheet [
+  <!ENTITY nbsp "&#160;">
+]>
+<html xsl:version="1.0"
+      xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+      lang="fr"
+      
+      >
+     
+      
+        <head>
+          <!--<link rel="stylesheet" href="C:\\svn\\lib\\majic_lib\\xsl\\style.css" type="text/css" />-->
+          <link href="style.css" type="text/css" rel="stylesheet" />
+          
+        </head>
+		    <body>
+          <hr size="5"/>
+          <h1>
+            <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle">
+              Parcelle <xsl:value-of select="@section" /><xsl:value-of select="@num_parc" />
+            </xsl:for-each>
+          </h1>
+          <hr size="10"/>
+          <Table cellspacing="2" cellpadding="5" >
+            <TR>
+              <TH align="left" width ="15%">
+                Adresse :
+              </TH>
+              <TD align="left" width ="85%">
+                <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle">
+                  <xsl:value-of select="@adresse" />
+                </xsl:for-each>
+              </TD>
+            </TR>
+            <TR>
+              <TH align="left" width ="15%">
+                Commune :
+              </TH>
+              <TD align="left" width ="85%">
+                <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle">
+                  <xsl:value-of select="@libcom" />
+                </xsl:for-each>  
+              </TD>
+            </TR>
+            <TR>
+              <TH align="left" width ="15%">
+                Code Commune (Insee) :
+              </TH>
+              <TD align="left" width ="85%">
+                <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle">
+                  <xsl:value-of select="@codeinsee" />
+                </xsl:for-each>
+              </TD>
+            </TR>
+            <TR>
+              <TH align="left" width ="15%">
+                Cpte Propriétaire :
+              </TH>
+              <TD align="left" width ="85%">
+                <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle">
+                  <xsl:value-of select="Mj_Parcelle/@dnupro" /> <BR/>
+                </xsl:for-each>
+              </TD>
+            </TR>
+            <TR>
+              <TH align="left" width ="15%">
+                Surface cadastrale (m²) :
+              </TH>
+              <TD align="left" width ="85%">
+                <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle">
+                   <xsl:value-of select="@total_contenance_m2" /> 
+                </xsl:for-each>
+              </TD>
+            </TR>
+            <TR>
+              <TH align="left" width ="15%">
+                Urbaine :
+              </TH>
+              <TD align="left" width ="85%">
+                A Chercher ???
+              </TD>
+            </TR>
+            <TR>
+              <TH align="left" width ="15%">
+                Bâtie :
+              </TH>
+              <TD align="left" width ="85%">
+                <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle">
+                  <xsl:value-of select="@gparbat" />
+                </xsl:for-each>
+              </TD>
+            </TR>
+            <TR>
+              <TH align="left" width ="15%">
+                Parcelle primitive :
+              </TH>
+              <TD align="left" width ="85%">
+                A Chercher ???
+              </TD>
+            </TR>
+           </Table>
+          <img>
+            <xsl:attribute name="src">
+              <xsl:value-of select = "concat('http://www.maison-passive-nice.fr/images/','parcelle.gif')"/>
+            </xsl:attribute>
+          </img>          
+            <hr size="5"/>
+            <h4>
+              Propriétaire(s) de la parcelle
+            </h4>
+          <Table cellspacing="2" cellpadding="5">
+            <TR>
+              <TH>
+                Compte
+              </TH>
+              <TH>
+                Nom
+              </TH>
+              <TH>
+                Etat Civil
+              </TH>
+              <TH>
+                Adresse
+              </TH>
+              <TH>
+                Type
+              </TH>
+            </TR>
+            <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Proprietaire">
+            <TR>
+              <TD>
+                <xsl:value-of select="@dnupro" />&nbsp;
+              </TD>
+              <TD>
+                <xsl:value-of select="@proprietaire_nom_tiers" />&nbsp;
+              </TD>
+              <TD>
+                <xsl:value-of select="@jdatnss" />
+                <BR/>
+                <xsl:value-of select="@dldnss" />&nbsp;
+              </TD>
+              <TD>
+                <xsl:value-of select="@proprietaire_adresse" />&nbsp;
+              </TD>
+              <TD>
+                <xsl:value-of select="@l_ccodro" /> &nbsp;
+              </TD>
+            </TR>
+            </xsl:for-each>
+          </Table>
+          <hr size="5"/>
+          <h4>
+            Subdivision(s) Fiscale(s)
+          </h4>
+          <Table cellspacing="2" cellpadding="5">
+            <TR>
+              <TH>
+                Lettre
+              </TH>
+              <TH>
+                groupe
+              </TH>
+              <TH>
+                Nature
+              </TH>
+              <TH>
+                Occupation
+              </TH>
+              <TH>
+                Classe
+              </TH>
+              <TH>
+                Compte
+              </TH>
+              <TH>
+                Surface (m²)
+              </TH>
+              <TH>
+                Revenu (€)
+              </TH>
+              <TH>
+                Référence
+              </TH>
+            </TR>
+            <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle/Mj_Suf">
+              <TR>
+                <TD>
+                  <xsl:value-of select="@suf" />&nbsp;
+                </TD>
+                <TD>
+                  <xsl:value-of select="@grss_gr" />&nbsp;
+                </TD>
+                <TD>
+                  <xsl:value-of select="@nat_cult" />&nbsp;
+                </TD>
+                <TD>
+                  ???
+                </TD>
+                <TD>
+                  <xsl:value-of select="@clas" />&nbsp;
+                </TD>
+                <TD>
+                  <xsl:value-of select="@dnupro" />&nbsp;
+                </TD>
+                <TD>
+                  <xsl:value-of select="@contenance_suf" />&nbsp;
+                </TD>
+                <TD>
+                  <xsl:value-of select="@revenu_cadastral_txt" />&nbsp;
+                </TD>
+                <TD>
+                  <xsl:value-of select="@revenu_reference_txt" />&nbsp;
+                </TD>
+              </TR>
+            </xsl:for-each>
+          </Table>
+          <hr size="5"/>
+          <h4>
+            Elément(s) Bâti(s)
+          </h4>
+          <Table cellspacing="2" cellpadding="5">
+            <TR>
+              <TH>
+                Ref. local
+              </TH>
+              <TH>
+                Nature
+              </TH>
+              <TH>
+                Date mutation
+              </TH>
+              <TH>
+                Propriétaire(s)
+              </TH>
+            </TR>
+            <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Bati">
+            <TR>
+              <TD>
+					<a href="<xsl:value-of select="@num_invar" />"><xsl:value-of select="@num_invar" /></a>&nbsp;
+              </TD>
+              <TD>
+                <xsl:value-of select="@nature" />&nbsp;
+              </TD>
+              <TD>
+                <xsl:value-of select="@date_mut" />&nbsp;
+              </TD>
+              <TD>
+                <xsl:value-of select="Mj_Proprietaire/@proprietaire_nom" />&nbsp;
+              </TD>
+            </TR>
+            </xsl:for-each>
+          </Table>
+          <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Bati">
+          <hr size="15"/>
+          <h1>
+            
+            <a name="<xsl:value-of select="@num_invar" />">Local n° <xsl:value-of select="@num_invar" /></a>
+            
+          </h1>
+          <hr size="10"/>           
+          <Table cellspacing="2" cellpadding="5">
+            <TR>
+              <TH align="left" width="39%">
+                
+              </TH>
+              <TH align="left" width="40%">
+                
+              </TH>
+              <TH align="center" width="7%">
+                Bat
+              </TH>
+              <TH align="center" width="7%">
+                Esc
+              </TH>
+              <TH align="center" width="7%">
+                Etage
+              </TH>
+            </TR>
+            
+            <TR>
+              <TH align="left" width="39%">
+                Adresse :
+              </TH>
+              <TD align="left" width="40%">
+                <xsl:value-of select="@voirie" />&nbsp;<xsl:value-of select="@adresse" />&nbsp;
+              </TD>
+              <TD align="center" width="7%">
+                <xsl:value-of select="@bat" />&nbsp;
+              </TD>
+              <TD align="center" width="7%">
+                <xsl:value-of select="@ent" />&nbsp;
+              </TD>
+              <TD align="center" width="7%">
+                <xsl:value-of select="@niv" />&nbsp;
+              </TD>
+            </TR>
+            <TR>
+              <TH align="left" width="39%">
+                Commune :
+              </TH>
+              <TD align="left" width="40%">
+                <xsl:value-of select="@libcom" />&nbsp;
+              </TD>
+              <TD align="center" width="7%">
+
+              </TD>
+              <TD align="center" width="7%">
+
+              </TD>
+              <TD align="center" width="7%">
+
+              </TD>
+            </TR>
+            <TR>
+              <TH align="left" width="39%">
+                Type :
+              </TH>
+              <TD align="left" width="40%">
+                <xsl:value-of select="@dteloc" />&nbsp;
+              </TD>
+              <TD align="center" width="7%">
+
+              </TD>
+              <TD align="center" width="7%">
+
+              </TD>
+              <TD align="center" width="7%">
+
+              </TD>
+            </TR>
+            <TR>
+              <TH align="left" width="39%">
+                Occupation :
+              </TH>
+              <TD align="left" width="40%">
+                <xsl:value-of select="@occupation" />&nbsp;
+              </TD>
+              <TD align="center" width="7%">
+
+              </TD>
+              <TD align="center" width="7%">
+
+              </TD>
+              <TD align="center" width="7%">
+
+              </TD>
+            </TR>
+            <TR>
+              <TH align="left" width="39%">
+                Nature :
+              </TH>
+              <TD align="left" width="40%">
+                <xsl:value-of select="@nature" />&nbsp;
+              </TD>
+              <TD align="center" width="7%">
+
+              </TD>
+              <TD align="center" width="7%">
+
+              </TD>
+              <TD align="center" width="7%">
+
+              </TD>
+            </TR>
+            <TR>
+              <TH align="left" width="39%">
+                Année de construction :
+              </TH>
+              <TD align="left" width="40%">
+                <xsl:value-of select="@annee_constr" />&nbsp;
+              </TD>
+              <TD align="center" width="7%">
+
+              </TD>
+              <TD align="center" width="7%">
+
+              </TD>
+              <TD align="center" width="7%">
+
+              </TD>
+            </TR>
+            <TR>
+              <TH align="left" width="39%">
+                Date de mutation :
+              </TH>
+              <TD align="left" width="40%">
+                <xsl:value-of select="@date_mut" />&nbsp;
+              </TD>
+              <TD align="center" width="7%">
+
+              </TD>
+              <TD align="center" width="7%">
+
+              </TD>
+              <TD align="center" width="7%">
+
+              </TD>
+            </TR>
+            <TR>
+              <TH align="left" width="39%">
+                Valeur cadastrale (€) :
+              </TH>
+              <TD align="left" width="40%">
+                ????
+              </TD>
+              <TD align="center" width="7%">
+
+              </TD>
+              <TD align="center" width="7%">
+
+              </TD>
+              <TD align="center" width="7%">
+
+              </TD>
+            </TR>
+            <TR>
+              <TH align="left" width="39%">
+                Niveaux :
+              </TH>
+              <TD align="left" width="40%">
+                <xsl:value-of select="@niveaux" />&nbsp;
+              </TD>
+              <TD align="center" width="7%">
+
+              </TD>
+              <TD align="center" width="7%">
+
+              </TD>
+              <TD align="center" width="7%">
+
+              </TD>
+            </TR>
+            
+          </Table>
+          <hr size="5"/>
+            <h4>
+              Propriétaire(s) du local
+            </h4>
+            <Table cellspacing="2" cellpadding="5">
+              <TR>
+                <TH>
+                  Compte
+                </TH>
+                <TH>
+                  Nom
+                </TH>
+                <TH>
+                  État Civil
+                </TH>
+                <TH>
+                  Adresse
+                </TH>
+                <TH>
+                  Type
+                </TH>
+              </TR>
+
+              <TR>
+                <TD>
+                  <xsl:value-of select="Mj_Proprietaire/@dnupro" />&nbsp;
+                </TD>
+                <TD>
+                  <xsl:value-of select="Mj_Proprietaire/@proprietaire_nom" />&nbsp;
+                </TD>
+                <TD>
+                  <xsl:value-of select="Mj_Proprietaire/@jdatnss" />
+                  <BR/>
+                  <xsl:value-of select="Mj_Proprietaire/@dldnss" />&nbsp;
+                </TD>
+                <TD>
+                  <xsl:value-of select="Mj_Proprietaire/@proprietaire_adresse" />&nbsp;
+                </TD>
+                <TD>
+                  <xsl:value-of select="Mj_Proprietaire/@l_ccodro" />&nbsp;
+                </TD>
+              </TR>
+
+            </Table>
+            <hr size="5"/>
+          <h4>
+            P.E.V
+          </h4>
+          <Table cellspacing="2" cellpadding="5">
+            <TR>
+              <TH>
+                N°
+              </TH>
+              <TH>
+                Nature
+              </TH>
+              <TH>
+                Catégorie
+              </TH>
+              <TH>
+                Tarif
+              </TH>
+              <TH>
+                Local Type
+              </TH>
+              <TH>
+                Val. Loc. Ref. (€)
+              </TH>
+              <TH>
+                Val. Loc. Ann. (€)
+              </TH>
+              <TH>
+                Nat. Exemp.
+              </TH>
+            </TR>
+            
+            <TR>
+              <TD>
+                <xsl:value-of select="Mj_Pev/@num_pev" />&nbsp;
+              </TD>
+              <TD>
+                <xsl:value-of select="Mj_Pev/@af" />&nbsp;
+              </TD>
+              <TD>
+                <xsl:value-of select="Mj_Pev/@cat" />&nbsp;
+              </TD>
+              <TD>
+                <xsl:value-of select="Mj_Pev/@s_tar" />&nbsp;
+              </TD>
+              <TD>
+                <xsl:value-of select="Mj_Pev/@local_type" />&nbsp;
+              </TD>
+              <TD>
+                <xsl:value-of select="Mj_Pev/@val_loc_ref" />&nbsp;
+              </TD>
+              <TD>
+                <xsl:value-of select="Mj_Pev/@val_loc_ann" />&nbsp;
+              </TD>
+              <TD>
+                <xsl:value-of select="Mj_Pev/@nature" />&nbsp;
+              </TD>
+            </TR>            
+          </Table>
+
+          <xsl:if test ="Mj_Pev/Mj_Habit_Descr[@num_pev]"> 
+          <hr size="5"/>
+          <h4>
+            Habitation principale
+            <BR/>
+          </h4>
+            <h5>
+              N° P.E.V : <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@num_pev" />
+            </h5>
+          <Table cellspacing="2" cellpadding="5">
+            <TR>
+              <TH width="30%">
+                Divers
+              </TH>
+              <TH width="40%">
+                Eléments de confort
+              </TH>
+              <TH width="10%">
+                Pièces
+              </TH>
+              <TH width="20">
+                Surfaces (m²)
+              </TH>
+            </TR>
+            <TR>
+              <TD width="30%">
+                <Table cellspacing="2" cellpadding="5">
+                  <TR>
+                    <TD align ="left">
+                      Surface (m²) :
+                    </TD>
+                    
+                    <TD align ="right">
+                      <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@suf_piece_total" />&nbsp;
+                    </TD>
+                   
+                  </TR>
+                  <TR>
+                    <TD align ="left">
+                      Nbr pièces :
+                    </TD>
+                    
+                      <TD align ="right">
+                        <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_piece_total" />&nbsp;
+                      </TD>
+                    
+                  </TR>
+                  <TR>
+                    <TD align ="left">
+                      Nbr pièces princ. :
+                    </TD>
+                    
+                      <TD align ="right">
+                        <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_piece_principal" />&nbsp;
+                      </TD>
+                    
+                  </TR>
+                  <TR>
+                    <TD align ="left">
+                      Entretien :
+                    </TD>
+                    
+                      <TD align ="right">
+                        <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@Etat" />&nbsp;
+                      </TD>
+                    
+                  </TR>
+                  <TR>
+                    <TD align ="left">
+                      Année de Constr. :
+                    </TD>
+                    
+                      <TD align ="right">
+                        <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@annee_constr" />&nbsp;
+                      </TD>
+                    
+                  </TR>
+                  <TR>
+                    <TD align ="left">
+                      Nbr Niveaux :
+                    </TD>
+                    
+                      <TD align ="right">
+                        <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_niveaux" />&nbsp;
+                      </TD>
+                   
+                  </TR>
+                  <TR>
+                    <TD align ="left">
+                      Gros murs :
+                    </TD>
+                    
+                      <TD align ="right">
+                        <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@mat_gros_mur" />&nbsp;
+                      </TD>
+                    
+                  </TR>
+                  <TR>
+                    <TD align ="left">
+                      Toitures : 
+                    </TD>
+                    
+                      <TD align ="right">
+                        <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@mat_toiture" />&nbsp;
+                      </TD>
+                    
+                  </TR>
+                </Table>
+              </TD> 
+              <TD width="40%">
+                <Table cellspacing="2" cellpadding="5">
+                  <TR>
+                    <TD align ="left">
+                      <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_baignoires" />&nbsp;
+                    </TD>
+                    <TD align ="left" width ="75%">
+                      Baignoire(s)
+                    </TD>
+                  </TR>
+                  <TR>
+                    
+                      <TD align ="left">
+                        <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_douches" />&nbsp;
+                      </TD>
+                    
+                    <TD align ="left" width ="75%">
+                      Douche(s)
+                    </TD>
+                  </TR>
+                  <TR>
+                    
+                      <TD align ="left">
+                        <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_lavabos" />&nbsp;
+                      </TD>
+                    
+                    <TD align ="left" width ="75%">
+                      Lavabo(s)
+                    </TD>  
+                  </TR>
+                  <TR>
+                    
+                      <TD align ="left">
+                        <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_wc" />&nbsp;
+                      </TD>
+                  
+                    <TD align ="left" width ="75%">
+                      W.C.
+                    </TD>
+                  </TR>
+                  <TR>
+                    <TD align ="left">
+                       Eau :
+                    </TD>
+                    <TD align ="left" width ="75%">
+                       <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@eau" />&nbsp;
+                    </TD>
+                  </TR>
+                  <TR>
+                    <TD align ="left">
+                      Electricité :
+                    </TD>
+                    <TD align ="left" width ="75%">
+                      <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@elect" />&nbsp;
+                    </TD>
+                  </TR>
+                  <TR>
+                    <TD align ="left">
+                      Gaz :
+                    </TD>
+                    <TD align ="left" width ="75%">
+                      <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@gaz" />&nbsp;
+                    </TD>
+                  </TR>
+                  <TR>
+                    <TD align ="left">
+                      Esc. de service :
+                    </TD>
+                    <TD align ="left" width ="75%">
+                      <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@esc_serv" />&nbsp;
+                    </TD>
+                  </TR>
+                  <TR>
+                    <TD align ="left">
+                      Ascenseur :
+                    </TD>
+                    <TD align ="left" width ="75%">
+                      <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@asc" />&nbsp;
+                    </TD>
+                  </TR>
+                  <TR>
+                    <TD align ="left">
+                      Chauffage :
+                    </TD>
+                    <TD align ="left" width ="75%">
+                      <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@chauf" />&nbsp;
+                    </TD>
+                  </TR>
+                  <TR>
+                    <TD align ="left">
+                      Vide ordure :
+                    </TD>
+                    <TD align ="left" width ="75%">
+                      <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@vide_ord" />&nbsp;
+                    </TD>
+                  </TR>
+                  <TR>
+                    <TD align ="left">
+                      Égout :
+                    </TD>
+                    <TD align ="left" width ="75%">
+                      <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@egout" />&nbsp;
+                    </TD>
+                  </TR>
+                </Table>
+              </TD>
+              <TD width="15%">
+                <Table cellspacing="2" cellpadding="5">
+                  <TR>
+                    
+                      <TD align ="left">
+                        <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_sam" />&nbsp;
+                      </TD>
+                    
+                    <TD align ="left" width ="75%">
+                      S. a manger
+                    </TD>
+                  </TR>
+                  <TR>
+                    
+                      <TD align ="left">
+                        <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_chambre" />&nbsp;
+                      </TD>
+                    
+                    <TD align ="left" width ="75%">
+                      Chambre
+                    </TD>
+                  </TR>
+                  <TR>
+                    
+                      <TD align ="left">
+                        <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_cuisine_m9" />&nbsp;
+                      </TD>
+                    
+                    <TD align ="left" width ="75%">
+                      Cuisine (inf.9m2)
+                    </TD>
+                  </TR>
+                  <TR>
+
+                    <TD align ="left">
+                      <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_cuisine_p9" />&nbsp;
+                    </TD>
+
+                    <TD align ="left" width ="75%">
+                      Cuisine (sup.9m2)
+                    </TD>
+                  </TR>
+                  <TR>
+                    
+                      <TD align ="left">
+                        <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_salle_eau" />&nbsp;
+                      </TD>
+                    
+                    <TD align ="left" width ="75%">
+                      S. de bain
+                    </TD>
+                  </TR>
+                  <TR>
+                    
+                      <TD align ="left">
+                        <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_annexe" />&nbsp;
+                      </TD>
+                    
+                    <TD align ="left" width ="75%">
+                      Annexe
+                    </TD>
+                  </TR>
+                </Table>
+              </TD>
+              <TD width="15%">
+                <Table cellspacing="2" cellpadding="5">
+                  <TR>
+                  
+                      <TD align ="left">
+                        <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@suf_cave" />&nbsp;
+                      </TD>
+                      <TD align ="left" width ="75%">
+                        <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@cave" />&nbsp;
+                      </TD>
+                    
+                  </TR>
+                  <TR>
+                    
+                      <TD align ="left">
+                        <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@suf_grenier" />&nbsp;
+                      </TD>
+                      <TD align ="left" width ="75%">
+                        <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@grenier" />&nbsp;
+                      </TD>
+                    
+                  </TR>
+                  <TR>
+                    
+                      <TD align ="left">
+                        <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@suf_terrasse" />&nbsp;
+                      </TD>
+                      <TD align ="left" width ="75%">
+                        <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@terrasse" />&nbsp;
+                      </TD>
+                    
+                  </TR>
+                  <TR>
+                   
+                      <TD align ="left">
+                        <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@suf_garage" />&nbsp;
+                      </TD>
+                      <TD align ="left" width ="75%">
+                        <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@garage" />&nbsp;
+                      </TD>
+                    
+                  </TR>
+                </Table>
+              </TD>
+            </TR>
+          </Table>
+          </xsl:if>
+          <xsl:if test ="Mj_Pev/Mj_Depend_Descr[@num_pev]">
+            <hr size="5"/>
+            <h4>
+              Dépendance(s)
+            </h4>
+            <Table cellspacing="2" cellpadding="5">
+              <TR>
+                <TH>
+                  N°
+                </TH>
+                <TH>
+                  Nature
+                </TH>
+                <TH>
+                  Surface (m²)
+                </TH>
+                <TH>
+                  Pondération
+                </TH>
+                <TH>
+                  Entretien
+                </TH>
+                <TH>
+                  Gros murs
+                </TH>
+                <TH>
+                  Toitures
+                </TH>
+                <TH>
+                  Elt. confort
+                </TH>
+              </TR>
+              <TR>
+
+                <TD>
+                  <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@num_depend" />&nbsp;
+                </TD>
+                <TD>
+                  <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@nature" />&nbsp;
+                </TD>
+                <TD>
+                  <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@surface" />&nbsp;
+                </TD>
+                <TD>
+                  <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@ponderation" />&nbsp;
+                </TD>
+                <TD>
+                  <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@Etat" />&nbsp;
+                </TD>
+                <TD>
+                  <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@mat_gros_mur" />&nbsp;
+                </TD>
+                <TD>
+                  <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@mat_toiture" />&nbsp;
+                </TD>
+
+                <TD>
+
+                  (<xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@eau" />) (<xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@elect" />) (<xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@chauf" />)&nbsp;
+
+                  <Table cellspacing="2" cellpadding="5">
+                    <TR>
+
+                      <TD align ="left">
+                        <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@nb_baignoires" />&nbsp;
+                      </TD>
+
+                      <TD align ="left" width ="75%">
+                        Baignoire(s)
+                      </TD>
+                    </TR>
+                    <TR>
+
+                      <TD align ="left">
+                        <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@nb_douches" />&nbsp;
+                      </TD>
+
+                      <TD align ="left" width ="75%">
+                        Douche(s)
+                      </TD>
+
+                    </TR>
+                    <TR>
+
+                      <TD align ="left">
+                        <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@nb_lavabos" />&nbsp;
+                      </TD>
+
+                      <TD align ="left" width ="75%">
+                        Lavabo(s)
+                      </TD>
+                    </TR>
+                    <TR>
+
+                      <TD align ="left">
+                        <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@nb_wc" />&nbsp;
+                      </TD>
+
+                      <TD align ="left" width ="75%">
+                        W.C.
+                      </TD>
+                    </TR>
+                  </Table>
+                </TD>
+              </TR>
+            </Table>
+          </xsl:if>
+            <xsl:if test ="Mj_Pev/Mj_Prof_Descr[@num_pev]">
+              <hr size="5"/>
+              <h4>
+                Locaux Professionnels
+              </h4>
+              <Table cellspacing="2" cellpadding="5">
+                <TR>
+                  <TH>
+                    N°
+                  </TH>
+                  <TH>
+                    Surface (m²)
+                  </TH>
+                </TR>
+                <TR>
+                  <TD>
+                    <xsl:value-of select="Mj_Pev/Mj_Prof_Descr/@num_pev" />
+                  </TD>
+                  <TD>
+                    <xsl:value-of select="Mj_Pev/Mj_Prof_Descr/@surface" />
+                  </TD>
+                </TR>
+              </Table>
+            </xsl:if>
+          </xsl:for-each>
+        </body> 
+   </html>
+    
diff --git a/src/module_cadastre/web_service/class/majic_lib/xsl/FP_fo_Complet.xsl b/src/module_cadastre/web_service/class/majic_lib/xsl/FP_fo_Complet.xsl
new file mode 100755
index 0000000000000000000000000000000000000000..1ce443f25421b218f9d7409768da6d1b32330d51
--- /dev/null
+++ b/src/module_cadastre/web_service/class/majic_lib/xsl/FP_fo_Complet.xsl
@@ -0,0 +1,1762 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  <xsl:template match="/">
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="simple" page-width="21cm" page-height="29.7cm" margin-top="0.5cm" margin-bottom="0.5cm" margin-left="0.5cm" margin-right="0.5cm">
+          <fo:region-body margin-top="0cm" margin-bottom="0cm" margin-left="0.5cm" margin-right="0.5cm" />
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+
+      <fo:page-sequence master-reference="simple" font-family="Times">
+        <!-- Tableau global basé sur la structure de la première ligne du relevé de propriété -->
+        <fo:flow flow-name="xsl-region-body">
+          
+          <fo:block >
+            <fo:external-graphic >
+              <xsl:attribute name="src">
+                file:///C:\serveurs\Apache2\htdocs\rgd\images\bandeau.jpg
+              </xsl:attribute>
+            </fo:external-graphic>
+          </fo:block>
+
+          <fo:block color="#F1B4B4">
+            <fo:leader leader-length="100%" leader-pattern="rule"/>
+          </fo:block>
+          <fo:block text-align="left" vertical-align="middle" font-size="17pt" color="#008393">
+            <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle">
+              Parcelle <xsl:value-of select="@section" /><xsl:value-of select="format-number(@num_parc, '0000')"/> 
+            </xsl:for-each>
+          </fo:block>
+          <fo:block color="#F1B4B4">
+            <fo:leader leader-length="100%" leader-pattern="rule"/>
+          </fo:block>
+          <fo:table margin-bottom="35px" table-layout="fixed" width="100%" border-separation="2" >
+            <fo:table-column column-width="17%" />
+            <fo:table-column column-width="83%" />
+            <fo:table-body>
+              <fo:table-row>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Adresse :</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#F7F7F7" text-align="left"  padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@num_voirie" />
+                      <xsl:value-of select="@adresse" />
+                    </fo:block>
+                  </xsl:for-each>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Commune :</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#F7F7F7" text-align="left"  padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@libcom" />
+                    </fo:block>
+                  </xsl:for-each>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Code Commune (Insee) :</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#F7F7F7" text-align="left"  padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@codeinsee" />
+                    </fo:block>
+                  </xsl:for-each>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Cpte Propriétaire :</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#F7F7F7" text-align="left"  padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="Mj_Parcelle/@dnupro" />
+                    </fo:block>
+                    <!-- retour chariot -->
+                  </xsl:for-each>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Surface cadastrale (m²) :</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#F7F7F7" text-align="left"  padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@total_contenance_m2" />
+                    </fo:block>
+                  </xsl:for-each>
+                </fo:table-cell>
+              </fo:table-row>
+
+              <fo:table-row>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Urbaine :</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#F7F7F7" text-align="left"  padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@gurbpa" />
+                    </fo:block>
+                  </xsl:for-each>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Bâtie :</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#F7F7F7" text-align="left"  padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@gparbat" />
+                    </fo:block>
+                  </xsl:for-each>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Parcelle primitive :</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#F7F7F7" text-align="left"  padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:if test="not(@num_parc_prim = '')">
+                        <xsl:value-of select="@num_parc_prim" />
+                      </xsl:if>
+                      <xsl:if test="@num_parc_prim = ''">
+                        -
+                      </xsl:if>
+                    </fo:block>
+                  </xsl:for-each>
+                </fo:table-cell>
+              </fo:table-row>
+            </fo:table-body>
+          </fo:table>
+
+          <!--<fo:block>
+            <fo:external-graphic>
+              <xsl:attribute name="src">
+                http://mapsrv.rgd74.fr/geomap70/mg/net/ggGetMapImage.aspx?USER=Administrator&amp;PWD=admin&amp;MAPNAME=Library://RISNET_GESTION/Cartes/RGD 73-74 - RISNET_GESTION_73_74.MapDefinition&amp;SELOBJS=PARCELLE%2C<xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle">
+                  <xsl:value-of select='substring(@idpar,1,2)'/>
+                  <xsl:value-of select='substring(@idpar,4,3)'/>
+                  <xsl:if test ="substring(@idpar,7,3)='000'">
+                    <xsl:text disable-output-escaping="yes">-.-.-</xsl:text>
+                  </xsl:if>
+                  <xsl:if test ="not(substring(@idpar,7,3)='000')">
+                    <xsl:value-of select='substring(@idpar,7,3)'/>
+                  </xsl:if>
+                  <xsl:if test ="substring(@idpar,10,1)='0'">
+                    <xsl:text disable-output-escaping="yes">-</xsl:text>
+                  </xsl:if>
+                  <xsl:if test ="not(substring(@idpar,10,1)='0')">
+                    <xsl:value-of select='substring(@idpar,10,1)'/>
+                  </xsl:if>
+                  <xsl:value-of select='substring(@idpar,11,1)'/>
+                  <xsl:value-of select='substring(@idpar,12)'/>
+                </xsl:for-each>-&amp;CENTERX=&amp;CENTERY=&amp;SCALE=*8&amp;HEIGHT=400&amp;WIDTH=575&amp;RESULTTYPE=JPG
+              </xsl:attribute>
+            </fo:external-graphic>
+          </fo:block>-->
+          <fo:block text-align="left" vertical-align="middle" font-size="13pt" color="#990000">
+            Urbanisme : POS/PLU
+          </fo:block>
+          
+          <fo:table margin-bottom="35px" table-layout="fixed" width="100%" border-separation="2">
+            <fo:table-column column-width="9%" />
+            <fo:table-column column-width="27.48%" />
+            <fo:table-column column-width="15.38%" />
+            <fo:table-column column-width="7.29%" />
+            <fo:table-column column-width="7.29%" />
+            <fo:table-column column-width="9.79%" />
+            <fo:table-column column-width="23.77%" />
+
+            <fo:table-body>
+              <fo:table-row>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Zonage</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Libellé</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Surface (m2)*</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">COS</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">CES</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Hauteur</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Réglement de la zone</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+              <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle/Mj_PosPlu">
+                <fo:table-row>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@zonage" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@lib_zonage" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@surface" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@cos" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@ces" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@hauteur" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block color="blue" text-decoration="underline" text-align="left" vertical-align="middle" font-size="9pt">
+                      <fo:basic-link>
+                        <xsl:attribute name="external-destination">
+                          http://mapris.rgd74.fr/DocumentsPartenaires/Reglement_POS/ <xsl:value-of select="@idreg" />.pdf
+                        </xsl:attribute>Consulter le réglement
+                      </fo:basic-link>
+                    </fo:block>
+                  </fo:table-cell>
+                </fo:table-row>
+              </xsl:for-each>
+            </fo:table-body>
+          </fo:table>
+          <fo:block text-align="left" vertical-align="middle" font-size="8pt">
+            *calcul sur la surface graphique, exclusion si surf &#139; 2 m²
+          </fo:block>
+          <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle/Mj_PosPlu">
+            <fo:block color="blue" text-decoration="underline" text-align="left" vertical-align="middle" font-size="9pt">
+              <fo:basic-link>
+                <xsl:attribute name="external-destination">
+                  http://mapris.rgd74.fr/Risnet_Gestion/Application/Rapport/etat_pos_plu/fiche_pos.asp?codcom=<xsl:value-of select="@codecom" />
+                </xsl:attribute>Avancement de l'actualisation/mise en ligne du POS/PLU de cette commune
+              </fo:basic-link>
+            </fo:block>
+          </xsl:for-each>
+
+          <fo:block color="#F1B4B4">
+            <fo:leader leader-length="100%" leader-pattern="rule"/>
+          </fo:block>
+          <fo:block text-align="left" vertical-align="middle" font-size="13pt" color="#990000">
+            Propriétaire(s) de la parcelle
+          </fo:block>
+          <fo:block text-align="left" vertical-align="middle" font-size="8pt">
+            *Cliquer sur le n° de compte pour accéder à son relevé de propriété
+          </fo:block>
+          <fo:table margin-bottom="35px" table-layout="fixed" width="100%" border-separation="2">
+            <fo:table-column column-width="12%" />
+            <fo:table-column column-width="12%" />
+            <fo:table-column column-width="20%" />
+            <fo:table-column column-width="15%" />
+            <fo:table-column column-width="26%" />
+            <fo:table-column column-width="15%" />
+
+            <fo:table-body>
+              <fo:table-row>
+                <fo:table-cell number-columns-spanned="2" background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Compte</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Nom</fo:block>
+                </fo:table-cell>
+
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Etat Civil</fo:block>
+                </fo:table-cell>
+
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Adresse</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Type</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+              <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Proprietaire">
+                <fo:table-row>
+                  <fo:table-cell number-columns-spanned="2" background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block color="blue" text-decoration="underline" text-align="left" vertical-align="middle" font-size="9pt">
+                        <fo:basic-link>
+                          <xsl:attribute name="external-destination">
+                            http://localhost/rgd/rgdservices.phtml?operation=GetReleveprop&amp;compte=<xsl:value-of select="@dnupro"/>&amp;type=complet&amp;format=pdf&amp;version=1.0
+                          </xsl:attribute><xsl:value-of select="@dnupro" />
+                        </fo:basic-link>
+                      </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@proprietaire_nom" />
+                    </fo:block>
+                  </fo:table-cell>
+
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@jdatnss" />
+                    </fo:block>
+                    <!-- retour chariot -->
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@dldnss" />
+                    </fo:block>
+                  </fo:table-cell>
+
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@proprietaire_adresse" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@l_ccodro" />
+                    </fo:block>
+                  </fo:table-cell>
+                </fo:table-row>
+                <xsl:if test ="..//Mj_Parcelle/Mj_Suf/Mj_Proprietaire[@dnupro]">
+                  <fo:table-row>
+                    <fo:table-cell number-columns-spanned="6" background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">Détail</fo:block>
+                    </fo:table-cell>
+                  </fo:table-row>
+                  <fo:table-row>
+                    <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">Numéro du lot</fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">Compte</fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">Nom</fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">Etat Civil</fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">Adresse</fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">Type</fo:block>
+                    </fo:table-cell>
+                  </fo:table-row>
+                  <xsl:for-each select="../Mj_Parcelle/Mj_Suf/Mj_Proprietaire">
+                    <fo:table-row>
+                      <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                        <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                          <xsl:value-of select="../@dnulot" />
+                        </fo:block>
+                      </fo:table-cell>
+                      <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                        <fo:block color="blue" text-decoration="underline" text-align="left" vertical-align="middle" font-size="9pt">
+                          <fo:basic-link>
+                            <xsl:attribute name="external-destination">
+                              http://localhost/rgd/rgdservices.phtml?operation=GetReleveprop&amp;compte=<xsl:value-of select="@dnupro"/>&amp;type=complet&amp;format=pdf&amp;version=1.0
+                            </xsl:attribute>
+                            <xsl:value-of select="@dnupro" />
+                          </fo:basic-link>
+                        </fo:block>
+                      </fo:table-cell>
+                      <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                        <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                          <xsl:value-of select="@proprietaire_nom" />
+                        </fo:block>
+                      </fo:table-cell>
+                      <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                        <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                          <xsl:value-of select="@jdatnss" />
+                        </fo:block>
+                        <!-- retour chariot -->
+                        <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                          <xsl:value-of select="@dldnss" />
+                        </fo:block>
+                      </fo:table-cell>
+                      <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                        <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                          <xsl:value-of select="@proprietaire_adresse" />
+                        </fo:block>
+                      </fo:table-cell>
+                      <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                        <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                          <xsl:value-of select="@l_ccodro" />
+                        </fo:block>
+                      </fo:table-cell>
+                    </fo:table-row>
+                  </xsl:for-each>
+                </xsl:if>
+              </xsl:for-each>
+            </fo:table-body>
+          </fo:table>
+
+          <fo:block text-align="left" vertical-align="middle" font-size="13pt" color="#990000">
+            Subdivision(s) fiscale(s)
+          </fo:block>
+          <fo:table margin-bottom="35px" table-layout="fixed" width="100%" border-separation="2">
+
+            <fo:table-column column-width="11%" />
+            <fo:table-column column-width="11%" />
+            <fo:table-column column-width="11%" />
+            <fo:table-column column-width="11.2%" />
+            <fo:table-column column-width="11%" />
+            <fo:table-column column-width="11.2%" />
+            <fo:table-column column-width="11.2%" />
+            <fo:table-column column-width="11.2%" />
+            <fo:table-column column-width="11.2%" />
+
+            <fo:table-body>
+              <fo:table-row>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Lettre</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Groupe</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Nature</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Occupation</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Classe</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Compte</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Surface (m²)</fo:block>
+                </fo:table-cell>
+
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Revenu (€)</fo:block>
+                </fo:table-cell>
+
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Référence</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+              <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle/Mj_Suf">
+                <fo:table-row>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:if test="not(@suf = '')">
+                        <xsl:value-of select="@suf" />
+                      </xsl:if>
+                      <xsl:if test="@suf = ''">
+                        -
+                      </xsl:if>
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:if test="not(@groupe = '')">
+                        <xsl:value-of select="@groupe" />
+                      </xsl:if>
+                      <xsl:if test="@groupe = ''">
+                        -
+                      </xsl:if>
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:if test="not(@nature = '')">
+                        <xsl:value-of select="@nature" />
+                      </xsl:if>
+                      <xsl:if test="@nature = ''">
+                        -
+                      </xsl:if>
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">-</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:if test="not(@clas = '')">
+                        <xsl:value-of select="@clas" />
+                      </xsl:if>
+                      <xsl:if test="@clas = ''">
+                        -
+                      </xsl:if>
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@dnupro" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@contenance_suf" />
+                    </fo:block>
+                  </fo:table-cell>
+
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@revenu_cadastral_txt" />
+                    </fo:block>
+                  </fo:table-cell>
+
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@revenu_reference_txt" />
+                    </fo:block>
+                  </fo:table-cell>
+                </fo:table-row>
+              </xsl:for-each>
+            </fo:table-body>
+          </fo:table>
+
+          <xsl:if test="count(Mj/Mj_Compte_Communal_Parcelle/Mj_Bati) &gt; 0">
+            <fo:block color="#F1B4B4">
+              <fo:leader leader-length="100%" leader-pattern="rule"/>
+            </fo:block>
+            <fo:block text-align="left" vertical-align="middle" font-size="13pt" color="#990000">
+              Elément(s) bâti(s)
+            </fo:block>
+            <fo:table margin-bottom="35px" table-layout="fixed" width="100%" border-separation="2">
+
+              <fo:table-column column-width="15%" />
+              <fo:table-column column-width="15%" />
+              <fo:table-column column-width="15%" />
+              <fo:table-column column-width="55%" />
+
+              <fo:table-body>
+                <fo:table-row>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">Ref. local</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">Nature</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">Date mutation</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">Propriétaire(s)</fo:block>
+                  </fo:table-cell>
+                </fo:table-row>
+                <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Bati">
+                  <xsl:for-each select="Mj_Proprietaire">
+                    <fo:table-row>
+                      <xsl:if test="position()='1'">
+                        <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                          <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                            <xsl:value-of select="../@num_invar" />
+                          </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                          <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                            <xsl:value-of select="../@lib_nature" />
+                          </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                          <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                            <xsl:value-of select="../@date_mut" />
+                          </fo:block>
+                        </fo:table-cell>
+                      </xsl:if>
+                      <xsl:if test="position() &gt; '1'">
+                        <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                          <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                          </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                          <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                          </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                          <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                          </fo:block>
+                        </fo:table-cell>
+                      </xsl:if>
+                      <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                        <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                          <xsl:value-of select="@proprietaire_nom" />
+                        </fo:block>
+                      </fo:table-cell>
+                    </fo:table-row>
+                  </xsl:for-each>
+                </xsl:for-each>
+              </fo:table-body>
+            </fo:table>
+          </xsl:if>
+          <!-- .........................................Description du local, mode Complet................................................. -->
+          <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Bati">
+            <fo:block color="#F1B4B4">
+              <fo:leader leader-length="100%" leader-pattern="rule"/>
+            </fo:block>
+            <fo:block text-align="left" vertical-align="middle" font-size="15pt" color="#008393">
+              Local n° <xsl:value-of select="@num_invar" />
+            </fo:block>
+
+            <fo:block color="#F1B4B4">
+              <fo:leader leader-length="100%" leader-pattern="rule"/>
+            </fo:block>
+            <fo:table margin-bottom="35px" table-layout="fixed" width="100%" border-separation="2" >
+
+              <fo:table-column column-width="39%" />
+              <fo:table-column column-width="40%" />
+              <fo:table-column column-width="7%" />
+              <fo:table-column column-width="7%" />
+              <fo:table-column column-width="7%" />
+
+              <fo:table-body>
+                <fo:table-row>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt"></fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt"></fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#eeeeee" text-align="center" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">Bat</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#eeeeee" text-align="center" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">Esc</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#eeeeee" text-align="center" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">Etage</fo:block>
+                  </fo:table-cell>
+                </fo:table-row>
+
+                <fo:table-row>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">Adresse :</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@voirie" />
+                      <xsl:value-of select="@adresse" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="center" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@bat" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="center" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@ent" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="center" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@niv" />
+                    </fo:block>
+                  </fo:table-cell>
+                </fo:table-row>
+                <fo:table-row>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">Commune :</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@libcom" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="center" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt"></fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="center" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt"></fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="center" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt"></fo:block>
+                  </fo:table-cell>
+                </fo:table-row>
+                <fo:table-row>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">Type :</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@dteloc" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="center" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt"></fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="center" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt"></fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="center" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt"></fo:block>
+                  </fo:table-cell>
+                </fo:table-row>
+                <fo:table-row>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">Occupation :</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@lib_occupation" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="center" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt"></fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="center" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt"></fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="center" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt"></fo:block>
+                  </fo:table-cell>
+                </fo:table-row>
+                <fo:table-row>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">Nature :</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@lib_nature" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="center" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt"></fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="center" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt"></fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="center" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt"></fo:block>
+                  </fo:table-cell>
+                </fo:table-row>
+                <fo:table-row>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">Année de construction :</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:if test="not(@annee_constr = '0')">
+                        <xsl:value-of select="@annee_constr" />
+                      </xsl:if>
+                      <xsl:if test="@annee_constr = '0'">
+                        -
+                      </xsl:if>
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="center" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt"></fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="center" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt"></fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="center" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt"></fo:block>
+                  </fo:table-cell>
+                </fo:table-row>
+                <fo:table-row>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">Date de mutation :</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@date_mut" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="center" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt"></fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="center" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt"></fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="center" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt"></fo:block>
+                  </fo:table-cell>
+                </fo:table-row>
+                <fo:table-row>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">Valeur cadastrale (?) :</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="Mj_Pev/@revenu_cadastral" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="center" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt"></fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="center" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt"></fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="center" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt"></fo:block>
+                  </fo:table-cell>
+                </fo:table-row>
+                <fo:table-row>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">Niveaux :</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@niveaux" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="center" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt"></fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="center" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt"></fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="center" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt"></fo:block>
+                  </fo:table-cell>
+                </fo:table-row>
+              </fo:table-body>
+            </fo:table>
+
+            <fo:block color="#F1B4B4">
+              <fo:leader leader-length="100%" leader-pattern="rule"/>
+            </fo:block>
+
+            <fo:block text-align="left" vertical-align="middle" font-size="13pt" color="#990000">
+              Propriétaire(s) du local
+            </fo:block>
+
+            <fo:table margin-bottom="35px" table-layout="fixed" width="100%" border-separation="2">
+              <fo:table-column column-width="15%" />
+              <fo:table-column column-width="27.5%" />
+              <fo:table-column column-width="15%" />
+              <fo:table-column column-width="27.5%" />
+              <fo:table-column column-width="15%" />
+
+              <fo:table-body>
+                <fo:table-row>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">Compte</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">Nom</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">État Civil</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">Adresse</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">Type</fo:block>
+                  </fo:table-cell>
+                </fo:table-row>
+
+                <xsl:for-each select="Mj_Proprietaire">
+                  <fo:table-row>
+                    <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block color="blue" text-decoration="underline" text-align="left" vertical-align="middle" font-size="9pt">
+                        <fo:basic-link>
+                          <xsl:attribute name="external-destination">
+                            http://localhost/rgd/rgdservices.phtml?operation=GetReleveprop&amp;compte=<xsl:value-of select="@dnupro"/>&amp;type=complet&amp;format=pdf&amp;version=1.0
+                          </xsl:attribute>
+                          <xsl:value-of select="@dnupro" />
+                        </fo:basic-link>
+                      </fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                        <xsl:value-of select="@proprietaire_nom" />
+                      </fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                        <xsl:value-of select="@jdatnss" />
+                        <!-- retour chariot -->
+                        <xsl:value-of select="@dldnss" />
+                      </fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                        <xsl:value-of select="@proprietaire_adresse" />
+                      </fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                        <xsl:value-of select="@l_ccodro" />
+                      </fo:block>
+                    </fo:table-cell>
+                  </fo:table-row>
+                </xsl:for-each>
+              </fo:table-body>
+            </fo:table>
+
+            <fo:block color="#F1B4B4">
+              <fo:leader leader-length="100%" leader-pattern="rule"/>
+            </fo:block>
+            <fo:block text-align="left" vertical-align="middle" font-size="13pt" color="#990000">
+              P.E.V
+            </fo:block>
+            <fo:table margin-bottom="35px" table-layout="fixed" width="100%" border-separation="2">
+
+              <fo:table-column column-width="12.5%" />
+              <fo:table-column column-width="12.5%" />
+              <fo:table-column column-width="12.5%" />
+              <fo:table-column column-width="12.5%" />
+              <fo:table-column column-width="12.5%" />
+              <fo:table-column column-width="12.5%" />
+              <fo:table-column column-width="12.5%" />
+              <fo:table-column column-width="12.5%" />
+
+              <fo:table-body>
+                <fo:table-row>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">N°</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">Nature</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">Catégorie</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">Tarif</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">Local Type</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">Val. Loc. Ref. (?)</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">Val. Loc. Ann. (?)</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">Nat. Exemp.</fo:block>
+                  </fo:table-cell>
+                </fo:table-row>
+
+                <xsl:for-each select="Mj_Pev">
+                  <fo:table-row>
+                    <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                        <xsl:if test="not(@num_pev = '')">
+                          <xsl:value-of select="@num_pev" />
+                        </xsl:if>
+                        <xsl:if test="@num_pev = ''">
+                          -
+                        </xsl:if>
+                      </fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                        <xsl:if test="not(@l_nature = '')">
+                          <xsl:value-of select="@l_nature" />
+                        </xsl:if>
+                        <xsl:if test="@l_nature = ''">
+                          -
+                        </xsl:if>
+                      </fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                        <xsl:if test="not(@cat = '')">
+                          <xsl:value-of select="@cat" />
+                        </xsl:if>
+                        <xsl:if test="@cat = ''">
+                          -
+                        </xsl:if>
+                      </fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                        <xsl:if test="not(@s_tar = '')">
+                          <xsl:value-of select="@s_tar" />
+                        </xsl:if>
+                        <xsl:if test="@s_tar = ''">
+                          -
+                        </xsl:if>
+                      </fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                        <xsl:if test="not(@local_type = '')">
+                          <xsl:value-of select="@local_type" />
+                        </xsl:if>
+                        <xsl:if test="@local_type = ''">
+                          -
+                        </xsl:if>
+                      </fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                        <xsl:if test="not(@val_loc_ref = '')">
+                          <xsl:value-of select="@val_loc_ref" />
+                        </xsl:if>
+                        <xsl:if test="@val_loc_ref = ''">
+                          -
+                        </xsl:if>
+                      </fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                        <xsl:if test="not(@val_loc_ann = '')">
+                          <xsl:value-of select="@val_loc_ann" />
+                        </xsl:if>
+                        <xsl:if test="@val_loc_ann = ''">
+                          -
+                        </xsl:if>
+                      </fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                        <xsl:if test="not(@l_nat_exon = '')">
+                          <xsl:value-of select="@l_nat_exon" />
+                        </xsl:if>
+                        <xsl:if test="@l_nat_exon = ''">
+                          -
+                        </xsl:if>
+                      </fo:block>
+                    </fo:table-cell>
+                  </fo:table-row>
+                </xsl:for-each>
+              </fo:table-body>
+            </fo:table>
+
+            <xsl:if test ="Mj_Pev/Mj_Habit_Descr[@num_pev]">
+              <fo:block color="#F1B4B4">
+                <fo:leader leader-length="100%" leader-pattern="rule"/>
+              </fo:block>
+              <fo:block text-align="left" vertical-align="middle" font-size="13pt" color="#990000">
+                Habitation principale
+                <!-- retour chariot -->
+              </fo:block>
+              <fo:block text-align="left" vertical-align="middle" font-size="8pt">
+                N° P.E.V : <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@num_pev" />
+              </fo:block>
+              <fo:table margin-bottom="35px" table-layout="fixed" width="100%" border-separation="2">
+
+                <fo:table-column column-width="30%" />
+                <fo:table-column column-width="30%" />
+                <fo:table-column column-width="20%" />
+                <fo:table-column column-width="20%" />
+
+                <fo:table-body>
+                  <fo:table-row>
+                    <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">Divers</fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">Eléments de confort</fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">Pièces</fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">Surfaces (m²)</fo:block>
+                    </fo:table-cell>
+                  </fo:table-row>
+                  <fo:table-row>
+                    <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:table table-layout="fixed" width="100%" border-separation="2">
+
+                        <fo:table-column column-width="60%" />
+                        <fo:table-column column-width="40%" />
+
+                        <fo:table-body>
+                          <fo:table-row>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">Surface (m²) :</fo:block>
+                            </fo:table-cell>
+
+                            <fo:table-cell background-color="#F7F7F7" text-align ="right" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@suf_piece_total" />
+                              </fo:block>
+                            </fo:table-cell>
+
+                          </fo:table-row>
+                          <fo:table-row>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">Nbr pièces :</fo:block>
+                            </fo:table-cell>
+
+                            <fo:table-cell background-color="#F7F7F7" text-align ="right" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_piece_total" />
+                              </fo:block>
+                            </fo:table-cell>
+
+                          </fo:table-row>
+                          <fo:table-row>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">Nbr pièces princ. :</fo:block>
+                            </fo:table-cell>
+
+                            <fo:table-cell background-color="#F7F7F7" text-align ="right" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_piece_principal" />
+                              </fo:block>
+                            </fo:table-cell>
+
+                          </fo:table-row>
+                          <fo:table-row>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">Entretien :</fo:block>
+                            </fo:table-cell>
+
+                            <fo:table-cell background-color="#F7F7F7" text-align ="right" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@l_Etat" />
+                              </fo:block>
+                            </fo:table-cell>
+
+                          </fo:table-row>
+                          <fo:table-row>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">Année de Constr. :</fo:block>
+                            </fo:table-cell>
+
+                            <fo:table-cell background-color="#F7F7F7" text-align ="right" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@annee_constr" />
+                              </fo:block>
+                            </fo:table-cell>
+
+                          </fo:table-row>
+                          <fo:table-row>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">Nbr Niveaux :</fo:block>
+                            </fo:table-cell>
+
+                            <fo:table-cell background-color="#F7F7F7" text-align ="right" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_niveaux" />
+                              </fo:block>
+                            </fo:table-cell>
+
+                          </fo:table-row>
+                          <fo:table-row>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">Gros murs :</fo:block>
+                            </fo:table-cell>
+
+                            <fo:table-cell background-color="#F7F7F7" text-align ="right" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@lib_mat_gros_mur" />
+                              </fo:block>
+                            </fo:table-cell>
+
+                          </fo:table-row>
+                          <fo:table-row>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">Toitures :</fo:block>
+                            </fo:table-cell>
+
+                            <fo:table-cell background-color="#F7F7F7" text-align ="right" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@lib_mat_toiture" />
+                              </fo:block>
+                            </fo:table-cell>
+
+                          </fo:table-row>
+                        </fo:table-body>
+                      </fo:table>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:table table-layout="fixed" width="100%" border-separation="2">
+
+                        <fo:table-column column-width="50%" />
+                        <fo:table-column column-width="50%" />
+
+                        <fo:table-body>
+                          <xsl:if test="Mj_Pev/Mj_Habit_Descr/@nb_baignoires &gt; 0">
+                            <fo:table-row>
+                              <fo:table-cell background-color="#F7F7F7" text-align ="left"  padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                                <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                  <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_baignoires" />
+                                </fo:block>
+                              </fo:table-cell>
+                              <fo:table-cell background-color="#F7F7F7" text-align ="left"  padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                                <fo:block text-align="left" vertical-align="middle" font-size="9pt">Baignoire(s)</fo:block>
+                              </fo:table-cell>
+                            </fo:table-row>
+                          </xsl:if>
+                          <xsl:if test="Mj_Pev/Mj_Habit_Descr/@nb_douches &gt; 0">
+                            <fo:table-row>
+                              <fo:table-cell background-color="#F7F7F7" text-align ="left"  padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                                <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                  <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_douches" />
+                                </fo:block>
+                              </fo:table-cell>
+                              <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                                <fo:block text-align="left" vertical-align="middle" font-size="9pt">Douche(s)</fo:block>
+                              </fo:table-cell>
+                            </fo:table-row>
+                          </xsl:if>
+                          <xsl:if test="Mj_Pev/Mj_Habit_Descr/@nb_lavabos &gt; 0">
+                            <fo:table-row>
+                              <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                                <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                  <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_lavabos" />
+                                </fo:block>
+                              </fo:table-cell>
+                              <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                                <fo:block text-align="left" vertical-align="middle" font-size="9pt">Lavabo(s)</fo:block>
+                              </fo:table-cell>
+                            </fo:table-row>
+                          </xsl:if>
+                          <xsl:if test="Mj_Pev/Mj_Habit_Descr/@nb_wc &gt; 0">
+                            <fo:table-row>
+                              <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                                <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                  <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_wc" />
+                                </fo:block>
+                              </fo:table-cell>
+                              <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                                <fo:block text-align="left" vertical-align="middle" font-size="9pt">W.C.</fo:block>
+                              </fo:table-cell>
+                            </fo:table-row>
+                          </xsl:if>
+                          <fo:table-row>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">Eau :</fo:block>
+                            </fo:table-cell>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@eau = 'EAU'">
+                                  Oui
+                                </xsl:if>
+                              </fo:block>
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@eau = ''">
+                                  -
+                                </xsl:if>
+                              </fo:block>
+                            </fo:table-cell>
+                          </fo:table-row>
+                          <fo:table-row>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">Electricité :</fo:block>
+                            </fo:table-cell>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@elect = 'ELECT'">
+                                  Oui
+                                </xsl:if>
+                              </fo:block>
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@elect = ''">
+                                  -
+                                </xsl:if>
+                              </fo:block>
+                            </fo:table-cell>
+                          </fo:table-row>
+                          <fo:table-row>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">Gaz :</fo:block>
+                            </fo:table-cell>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@gaz = 'GAZ'">
+                                  Oui
+                                </xsl:if>
+                              </fo:block>
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@gaz = ''">
+                                  -
+                                </xsl:if>
+                              </fo:block>
+                            </fo:table-cell>
+                          </fo:table-row>
+                          <fo:table-row>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">Esc. de service :</fo:block>
+                            </fo:table-cell>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@esc_serv = 'ESC_SERV'">
+                                  Oui
+                                </xsl:if>
+                              </fo:block>
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@esc_serv = ''">
+                                  -
+                                </xsl:if>
+                              </fo:block>
+                            </fo:table-cell>
+                          </fo:table-row>
+                          <fo:table-row>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">Ascenseur :</fo:block>
+                            </fo:table-cell>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@asc = 'ASC'">
+                                  Oui
+                                </xsl:if>
+                              </fo:block>
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@asc = ''">
+                                  -
+                                </xsl:if>
+                              </fo:block>
+                            </fo:table-cell>
+                          </fo:table-row>
+                          <fo:table-row>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">Chauffage :</fo:block>
+                            </fo:table-cell>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@chauf = 'CHAUF'">
+                                  Oui
+                                </xsl:if>
+                              </fo:block>
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@chauf = ''">
+                                  -
+                                </xsl:if>
+                              </fo:block>
+                            </fo:table-cell>
+                          </fo:table-row>
+                          <fo:table-row>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">Vide ordure :</fo:block>
+                            </fo:table-cell>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@vide_ord = 'VIDE_ORD'">
+                                  Oui
+                                </xsl:if>
+                              </fo:block>
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@vide_ord = ''">
+                                  -
+                                </xsl:if>
+                              </fo:block>
+                            </fo:table-cell>
+                          </fo:table-row>
+                          <fo:table-row>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">Égout :</fo:block>
+                            </fo:table-cell>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@egout = 'EGOUT'">
+                                  Oui
+                                </xsl:if>
+                              </fo:block>
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@egout = ''">
+                                  -
+                                </xsl:if>
+                              </fo:block>
+                            </fo:table-cell>
+                          </fo:table-row>
+                        </fo:table-body>
+                      </fo:table>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:table table-layout="fixed" width="100%" border-separation="2">
+
+                        <fo:table-column column-width="30%" />
+                        <fo:table-column column-width="70%" />
+
+                        <fo:table-body>
+                          <fo:table-row>
+
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left"  padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_sam" />
+                              </fo:block>
+                            </fo:table-cell>
+
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">S. a manger</fo:block>
+                            </fo:table-cell>
+                          </fo:table-row>
+                          <fo:table-row>
+
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_chambre" />
+                              </fo:block>
+                            </fo:table-cell>
+
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">Chambre</fo:block>
+                            </fo:table-cell>
+                          </fo:table-row>
+                          <fo:table-row>
+
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_cuisine_m9" />
+                              </fo:block>
+                            </fo:table-cell>
+
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">Cuisine (inf.9m2)</fo:block>
+                            </fo:table-cell>
+                          </fo:table-row>
+                          <fo:table-row>
+
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_cuisine_p9" />
+                              </fo:block>
+                            </fo:table-cell>
+
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">Cuisine (sup.9m2)</fo:block>
+                            </fo:table-cell>
+                          </fo:table-row>
+                          <fo:table-row>
+
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_salle_eau" />
+                              </fo:block>
+                            </fo:table-cell>
+
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">S. de bain</fo:block>
+                            </fo:table-cell>
+                          </fo:table-row>
+                          <fo:table-row>
+
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_annexe" />
+                              </fo:block>
+                            </fo:table-cell>
+
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">Annexe</fo:block>
+                            </fo:table-cell>
+                          </fo:table-row>
+                        </fo:table-body>
+                      </fo:table>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:table table-layout="fixed" width="100%" border-separation="2">
+
+                        <fo:table-column column-width="30%" />
+                        <fo:table-column column-width="70%" />
+
+                        <fo:table-body>
+                          <fo:table-row>
+
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@suf_cave" />
+                              </fo:block>
+                            </fo:table-cell>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                Cave(s)
+                              </fo:block>
+                            </fo:table-cell>
+
+                          </fo:table-row>
+                          <fo:table-row>
+
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@suf_grenier" />
+                              </fo:block>
+                            </fo:table-cell>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                Grenier(s)
+                              </fo:block>
+                            </fo:table-cell>
+
+                          </fo:table-row>
+                          <fo:table-row>
+
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@suf_terrasse" />
+                              </fo:block>
+                            </fo:table-cell>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                Terrasse(s)
+                              </fo:block>
+                            </fo:table-cell>
+
+                          </fo:table-row>
+                          <fo:table-row>
+
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@suf_garage" />
+                              </fo:block>
+                            </fo:table-cell>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                Garage(s)
+                              </fo:block>
+                            </fo:table-cell>
+
+                          </fo:table-row>
+                        </fo:table-body>
+                      </fo:table>
+                    </fo:table-cell>
+                  </fo:table-row>
+                </fo:table-body>
+              </fo:table>
+            </xsl:if>
+            <xsl:if test ="Mj_Pev/Mj_Depend_Descr[@num_pev]">
+              <fo:block color="#F1B4B4">
+                <fo:leader leader-length="100%" leader-pattern="rule"/>
+              </fo:block>
+              <fo:block text-align="left" vertical-align="middle" font-size="13pt" color="#990000">
+                Dépendance(s)
+              </fo:block>
+              <fo:table margin-bottom="35px" table-layout="fixed" width="100%" border-separation="2">
+
+                <fo:table-column column-width="10%" />
+                <fo:table-column column-width="12.5%" />
+                <fo:table-column column-width="11%" />
+                <fo:table-column column-width="11%" />
+                <fo:table-column column-width="11%" />
+                <fo:table-column column-width="12.5%" />
+                <fo:table-column column-width="12.5%" />
+                <fo:table-column column-width="19.5%" />
+
+                <fo:table-body>
+                  <fo:table-row>
+                    <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">N°</fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">Nature</fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">Surface (m²)</fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">Pondération</fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">Entretien</fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">Gros murs</fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">Toitures</fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">Elt. confort</fo:block>
+                    </fo:table-cell>
+                  </fo:table-row>
+                  <fo:table-row>
+
+                    <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                        <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@num_pev" />
+                      </fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                        <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@nature" />
+                      </fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                        <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@surface" />
+                      </fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                        <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@ponderation" />
+                      </fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                        <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@l_Etat" />
+                      </fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                        <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@lib_mat_gros_mur" />
+                      </fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                        <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@lib_mat_toiture" />
+                      </fo:block>
+                    </fo:table-cell>
+
+                    <fo:table-cell>
+                      <fo:table table-layout="fixed" width="100%" border-separation="2">
+
+                        <fo:table-column column-width="45%" />
+                        <fo:table-column column-width="55%" />
+
+                        <fo:table-body>
+                          <xsl:if test="Mj_Pev/Mj_Depend_Descr/@nb_baignoires &gt; 0">
+                            <fo:table-row>
+                              <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                                <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                  <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@nb_baignoires" />
+                                </fo:block>
+                              </fo:table-cell>
+                              <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                                <fo:block text-align="left" vertical-align="middle" font-size="9pt">Baignoire(s)</fo:block>
+                              </fo:table-cell>
+                            </fo:table-row>
+                          </xsl:if>
+                          <xsl:if test="Mj_Pev/Mj_Depend_Descr/@nb_douches &gt; 0">
+                            <fo:table-row>
+                              <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                                <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                  <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@nb_douches" />
+                                </fo:block>
+                              </fo:table-cell>
+                              <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                                <fo:block text-align="left" vertical-align="middle" font-size="9pt">Douche(s)</fo:block>
+                              </fo:table-cell>
+                            </fo:table-row>
+                          </xsl:if>
+                          <xsl:if test="Mj_Pev/Mj_Depend_Descr/@nb_lavabos &gt; 0">
+                            <fo:table-row>
+                              <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                                <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                  <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@nb_lavabos" />
+                                </fo:block>
+                              </fo:table-cell>
+                              <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                                <fo:block text-align="left" vertical-align="middle" font-size="9pt">Lavabo(s)</fo:block>
+                              </fo:table-cell>
+                            </fo:table-row>
+                          </xsl:if>
+                          <xsl:if test="Mj_Pev/Mj_Depend_Descr/@nb_wc &gt; 0">
+                            <fo:table-row>
+                              <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                                <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                  <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@nb_wc" />
+                                </fo:block>
+                              </fo:table-cell>
+                              <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                                <fo:block text-align="left" vertical-align="middle" font-size="9pt">W.C.</fo:block>
+                              </fo:table-cell>
+                            </fo:table-row>
+                          </xsl:if>
+                          <fo:table-row>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">Eau :</fo:block>
+                            </fo:table-cell>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:if test ="Mj_Pev/Mj_Depend_Descr/@eau = 'EAU'">
+                                  Oui
+                                </xsl:if>
+                              </fo:block>
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:if test ="Mj_Pev/Mj_Depend_Descr/@eau = ''">
+                                  -
+                                </xsl:if>
+                              </fo:block>
+                            </fo:table-cell>
+                          </fo:table-row>
+                          <fo:table-row>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">Chauffage :</fo:block>
+                            </fo:table-cell>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:if test ="Mj_Pev/Mj_Depend_Descr/@chauf = 'CHAUF'">
+                                  Oui
+                                </xsl:if>
+                              </fo:block>
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:if test ="Mj_Pev/Mj_Depend_Descr/@chauf = ''">
+                                  -
+                                </xsl:if>
+                              </fo:block>
+                            </fo:table-cell>
+                          </fo:table-row>
+                          <fo:table-row>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">Electricité :</fo:block>
+                            </fo:table-cell>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:if test ="Mj_Pev/Mj_Depend_Descr/@elect = 'ELECT'">
+                                  Oui
+                                </xsl:if>
+                              </fo:block>
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:if test ="Mj_Pev/Mj_Depend_Descr/@elect = ''">
+                                  -
+                                </xsl:if>
+                              </fo:block>
+                            </fo:table-cell>
+                          </fo:table-row>
+                        </fo:table-body>
+                      </fo:table>
+                    </fo:table-cell>
+                  </fo:table-row>
+                </fo:table-body>
+              </fo:table>
+            </xsl:if>
+            <xsl:if test ="Mj_Pev/Mj_Prof_Descr[@num_pev]">
+              <fo:block color="#F1B4B4">
+                <fo:leader leader-length="100%" leader-pattern="rule"/>
+              </fo:block>
+              <fo:block text-align="left" vertical-align="middle" font-size="13pt" color="#990000">
+                Locaux Professionnels
+              </fo:block>
+              <fo:table margin-bottom="35px" table-layout="fixed" width="100%" border-separation="2">
+
+                <fo:table-column column-width="15%" />
+                <fo:table-column column-width="85%" />
+
+                <fo:table-body>
+                  <fo:table-row>
+                    <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">N°</fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">Surface (m²)</fo:block>
+                    </fo:table-cell>
+                  </fo:table-row>
+                  <fo:table-row>
+                    <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                        <xsl:value-of select="Mj_Pev/Mj_Prof_Descr/@num_pev" />
+                      </fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                        <xsl:value-of select="Mj_Pev/Mj_Prof_Descr/@surface" />
+                      </fo:block>
+                    </fo:table-cell>
+                  </fo:table-row>
+                </fo:table-body>
+              </fo:table>
+            </xsl:if>
+          </xsl:for-each>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </xsl:template>
+</xsl:stylesheet>
+
+
diff --git a/src/module_cadastre/web_service/class/majic_lib/xsl/FP_fo_Restreint.xsl b/src/module_cadastre/web_service/class/majic_lib/xsl/FP_fo_Restreint.xsl
new file mode 100755
index 0000000000000000000000000000000000000000..a4ad0ace046dd98b69f2d2115e6839141bbd31ef
--- /dev/null
+++ b/src/module_cadastre/web_service/class/majic_lib/xsl/FP_fo_Restreint.xsl
@@ -0,0 +1,593 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  <xsl:template match="/">
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="simple" page-width="21cm" page-height="29.7cm" margin-top="0.5cm" margin-bottom="0.5cm" margin-left="0.5cm" margin-right="0.5cm">
+          <fo:region-body margin-top="0cm" margin-bottom="0cm" margin-left="0.5cm" margin-right="0.5cm" />
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+
+      <fo:page-sequence master-reference="simple" font-family="Times">
+        <!-- Tableau global bas� sur la structure de la premi�re ligne du relev� de propri�t� -->
+        <fo:flow flow-name="xsl-region-body">
+
+          <fo:block >
+            <fo:external-graphic >
+              <xsl:attribute name="src">
+                file:///C:\serveurs\Apache2\htdocs\rgd\images\bandeau.jpg
+              </xsl:attribute>
+            </fo:external-graphic>
+          </fo:block>
+
+          <fo:block color="#F1B4B4">
+            <fo:leader leader-length="100%" leader-pattern="rule"/>
+          </fo:block>
+          <fo:block text-align="left" vertical-align="middle" font-size="19pt" color="#008393">
+            <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle">
+              Parcelle <xsl:value-of select="@section" /><xsl:value-of select="format-number(@num_parc, '0000')"/> 
+            </xsl:for-each>
+          </fo:block>
+          <fo:block color="#F1B4B4">
+            <fo:leader leader-length="100%" leader-pattern="rule"/>
+          </fo:block>
+          <fo:table margin-bottom="35px" table-layout="fixed" width="100%" border-separation="2" >
+            <fo:table-column column-width="17%" />
+            <fo:table-column column-width="83%" />
+            <fo:table-body>
+              <fo:table-row>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Adresse :</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#F7F7F7" text-align="left"  padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@num_voirie" />
+                      <xsl:value-of select="@adresse" />
+                    </fo:block>
+                  </xsl:for-each>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Commune :</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#F7F7F7" text-align="left"  padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@libcom" />
+                    </fo:block>
+                  </xsl:for-each>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Code Commune (Insee) :</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#F7F7F7" text-align="left"  padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@codeinsee" />
+                    </fo:block>
+                  </xsl:for-each>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Cpte Propri�taire :</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#F7F7F7" text-align="left"  padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="Mj_Parcelle/@dnupro" />
+                    </fo:block>
+                    <!-- retour chariot -->
+                  </xsl:for-each>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Surface cadastrale (m�) :</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#F7F7F7" text-align="left"  padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@total_contenance_m2" />
+                    </fo:block>
+                  </xsl:for-each>
+                </fo:table-cell>
+              </fo:table-row>
+            </fo:table-body>
+          </fo:table>
+
+          <!--<fo:block>
+            <fo:external-graphic>
+              <xsl:attribute name="src">
+                http://mapsrv.rgd74.fr/geomap70/mg/net/ggGetMapImage.aspx?USER=Administrator&amp;PWD=admin&amp;MAPNAME=Library://RISNET_GESTION/Cartes/RGD 73-74 - RISNET_GESTION_73_74.MapDefinition&amp;SELOBJS=PARCELLE%2C<xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle">
+                  <xsl:value-of select='substring(@idpar,1,2)'/>
+                  <xsl:value-of select='substring(@idpar,4,3)'/>
+                  <xsl:if test ="substring(@idpar,7,3)='000'">
+                    <xsl:text disable-output-escaping="yes">-.-.-</xsl:text>
+                  </xsl:if>
+                  <xsl:if test ="not(substring(@idpar,7,3)='000')">
+                    <xsl:value-of select='substring(@idpar,7,3)'/>
+                  </xsl:if>
+                  <xsl:if test ="substring(@idpar,10,1)='0'">
+                    <xsl:text disable-output-escaping="yes">-</xsl:text>
+                  </xsl:if>
+                  <xsl:if test ="not(substring(@idpar,10,1)='0')">
+                    <xsl:value-of select='substring(@idpar,10,1)'/>
+                  </xsl:if>
+                  <xsl:value-of select='substring(@idpar,11,1)'/>
+                  <xsl:value-of select='substring(@idpar,12)'/>
+                </xsl:for-each>-&amp;CENTERX=&amp;CENTERY=&amp;SCALE=*8&amp;HEIGHT=400&amp;WIDTH=575&amp;RESULTTYPE=JPG
+              </xsl:attribute>
+            </fo:external-graphic>
+          </fo:block>-->
+          <fo:block text-align="left" vertical-align="middle" font-size="13pt" color="#990000">
+            Urbanisme : POS/PLU
+          </fo:block>
+            
+          <fo:table margin-bottom="35px" table-layout="fixed" width="100%" border-separation="2">
+            <fo:table-column column-width="9%" />
+            <fo:table-column column-width="27.48%" />
+            <fo:table-column column-width="15.38%" />
+            <fo:table-column column-width="7.29%" />
+            <fo:table-column column-width="7.29%" />
+            <fo:table-column column-width="9.79%" />
+            <fo:table-column column-width="23.77%" />
+
+            <fo:table-body>
+              <fo:table-row>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Zonage</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Libell�</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Surface (m2)*</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">COS</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">CES</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Hauteur</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">R�glement de la zone</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+              <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle/Mj_PosPlu">
+                <fo:table-row>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@zonage" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@lib_zonage" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@surface" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@cos" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@ces" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@hauteur" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block color="blue" text-decoration="underline" text-align="left" vertical-align="middle" font-size="9pt">
+                      <fo:basic-link>
+                        <xsl:attribute name="external-destination">
+                          http://mapris.rgd74.fr/DocumentsPartenaires/Reglement_POS/ <xsl:value-of select="@idreg" />.pdf
+                        </xsl:attribute>Consulter le r�glement
+                      </fo:basic-link>
+                    </fo:block>
+                  </fo:table-cell>
+                </fo:table-row>
+              </xsl:for-each>
+            </fo:table-body>
+          </fo:table>
+          <fo:block text-align="left" vertical-align="middle" font-size="8pt">
+            *calcul sur la surface graphique, exclusion si surf &#139; 2 m�
+          </fo:block>
+          <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle/Mj_PosPlu">
+            <fo:block color="blue" text-decoration="underline" text-align="left" vertical-align="middle" font-size="9pt">
+              <fo:basic-link>
+                <xsl:attribute name="external-destination">
+                  http://mapris.rgd74.fr/Risnet_Gestion/Application/Rapport/etat_pos_plu/fiche_pos.asp?codcom=<xsl:value-of select="@codecom" />
+                </xsl:attribute>Avancement de l'actualisation/mise en ligne du POS/PLU de cette commune
+              </fo:basic-link>
+            </fo:block>
+          </xsl:for-each>
+
+          <fo:block color="#F1B4B4">
+            <fo:leader leader-length="100%" leader-pattern="rule"/>
+          </fo:block>
+          <fo:block text-align="left" vertical-align="middle" font-size="13pt" color="#990000">
+            Propri�taire(s) de la parcelle
+          </fo:block>
+          <fo:block text-align="left" vertical-align="middle" font-size="8pt">
+            *Cliquer sur le n� de compte pour acc�der � son relev� de propri�t�
+          </fo:block>
+          <fo:table margin-bottom="35px" table-layout="fixed" width="100%" border-separation="2">
+            <fo:table-column column-width="12.5%" />
+            <fo:table-column column-width="12.5%" />
+            <fo:table-column column-width="30%" />
+            <fo:table-column column-width="30%" />
+            <fo:table-column column-width="15%" />
+
+            <fo:table-body>
+              <fo:table-row>
+                <fo:table-cell number-columns-spanned="2" background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Compte</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Nom</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Adresse</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Type</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+              <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Proprietaire">
+                <fo:table-row>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block color="blue" text-decoration="underline" text-align="left" vertical-align="middle" font-size="9pt">
+                      <fo:basic-link>
+                        <xsl:attribute name="external-destination">
+                          http://localhost/rgd/rgdservices.phtml?operation=GetReleveprop&amp;compte=<xsl:value-of select="@dnupro"/>&amp;type=restreint&amp;format=pdf&amp;version=1.0
+                        </xsl:attribute>
+                        <xsl:value-of select="@dnupro" />
+                      </fo:basic-link>
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@proprietaire_nom_tiers" />
+                    </fo:block>
+                  </fo:table-cell>
+
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@proprietaire_adresse" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@l_ccodro" />
+                    </fo:block>
+                  </fo:table-cell>
+                </fo:table-row>
+                <xsl:if test ="..//Mj_Parcelle/Mj_Suf/Mj_Proprietaire[@dnupro]">
+                  <fo:table-row>
+                    <fo:table-cell number-columns-spanned="5" background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">D�tail</fo:block>
+                    </fo:table-cell>
+                  </fo:table-row>
+                  <fo:table-row>
+                    <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">Num�ro du lot</fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">Compte</fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">Nom</fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">Adresse</fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">Type</fo:block>
+                    </fo:table-cell>
+                  </fo:table-row>
+                  <xsl:for-each select="../Mj_Parcelle/Mj_Suf/Mj_Proprietaire">
+                    <fo:table-row>
+                      <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                        <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                          <xsl:value-of select="../@dnulot" />
+                        </fo:block>
+                      </fo:table-cell>
+                      <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                        <fo:block color="blue" text-decoration="underline" text-align="left" vertical-align="middle" font-size="9pt">
+                          <fo:basic-link>
+                            <xsl:attribute name="external-destination">
+                              http://localhost/rgd/rgdservices.phtml?operation=GetReleveprop&amp;compte=<xsl:value-of select="@dnupro"/>&amp;type=restreint&amp;format=pdf&amp;version=1.0
+                            </xsl:attribute>
+                            <xsl:value-of select="@dnupro" />
+                          </fo:basic-link>
+                        </fo:block>
+                      </fo:table-cell>
+                      <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                        <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                          <xsl:value-of select="@proprietaire_nom" />
+                        </fo:block>
+                      </fo:table-cell>
+                      <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                        <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                          <xsl:value-of select="@proprietaire_adresse" />
+                        </fo:block>
+                      </fo:table-cell>
+                      <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                        <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                          <xsl:value-of select="@l_ccodro" />
+                        </fo:block>
+                      </fo:table-cell>
+                    </fo:table-row>
+                  </xsl:for-each>
+                </xsl:if>
+              </xsl:for-each>
+            </fo:table-body>
+          </fo:table>
+
+          <fo:block text-align="left" vertical-align="middle" font-size="13pt" color="#990000">
+            Subdivision(s) fiscale(s)
+          </fo:block>
+          <fo:table margin-bottom="35px" table-layout="fixed" width="100%" border-separation="2">
+
+            <fo:table-column column-width="12.4%" />
+            <fo:table-column column-width="12.4%" />
+            <fo:table-column column-width="12.4%" />
+            <fo:table-column column-width="12.6%" />
+            <fo:table-column column-width="12.4%" />
+            <fo:table-column column-width="12.6%" />
+            <fo:table-column column-width="12.6%" />
+            <fo:table-column column-width="12.6%" />
+
+            <fo:table-body>
+              <fo:table-row>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Lettre</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Groupe</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Nature</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Occupation</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Classe</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Compte</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Surface (m�)</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">R�f�rence</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+              <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle/Mj_Suf">
+                <fo:table-row>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:if test="not(@suf = '')">
+                        <xsl:value-of select="@suf" />
+                      </xsl:if>
+                      <xsl:if test="@suf = ''">
+                        -
+                      </xsl:if>
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:if test="not(@groupe = '')">
+                        <xsl:value-of select="@groupe" />
+                      </xsl:if>
+                      <xsl:if test="@groupe = ''">
+                        -
+                      </xsl:if>
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:if test="not(@nature = '')">
+                        <xsl:value-of select="@nature" />
+                      </xsl:if>
+                      <xsl:if test="@nature = ''">
+                        -
+                      </xsl:if>
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">-</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:if test="not(@clas = '')">
+                        <xsl:value-of select="@clas" />
+                      </xsl:if>
+                      <xsl:if test="@clas = ''">
+                        -
+                      </xsl:if>
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@dnupro" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@contenance_suf" />
+                    </fo:block>
+                  </fo:table-cell>
+
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@revenu_reference_txt" />
+                    </fo:block>
+                  </fo:table-cell>
+                </fo:table-row>
+              </xsl:for-each>
+            </fo:table-body>
+          </fo:table>
+
+          <xsl:if test="count(Mj/Mj_Compte_Communal_Parcelle/Mj_Bati) &gt; 0">
+            <fo:block color="#F1B4B4">
+              <fo:leader leader-length="100%" leader-pattern="rule"/>
+            </fo:block>
+            <fo:block text-align="left" vertical-align="middle" font-size="13pt" color="#990000">
+              El�ment(s) b�ti(s)
+            </fo:block>
+            <fo:table margin-bottom="35px" table-layout="fixed" width="100%" border-separation="2">
+
+              <fo:table-column column-width="15%" />
+              <fo:table-column column-width="15%" />
+              <fo:table-column column-width="15%" />
+              <fo:table-column column-width="55%" />
+
+              <fo:table-body>
+                <fo:table-row>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">Ref. local</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">Nature</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">Etages</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">Propri�taire(s)</fo:block>
+                  </fo:table-cell>
+                </fo:table-row>
+                <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Bati">
+                  <xsl:for-each select="Mj_Proprietaire">
+                    <fo:table-row>
+                      <xsl:if test="position()='1'">
+                        <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                          <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                            <xsl:value-of select="../@num_invar" />
+                          </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                          <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                            <xsl:value-of select="../@lib_nature" />
+                          </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                          <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                            <xsl:value-of select="../@niv" />
+                          </fo:block>
+                        </fo:table-cell>
+                      </xsl:if>
+                      <xsl:if test="position() &gt; '1'">
+                        <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                          <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                          </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                          <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                          </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                          <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                          </fo:block>
+                        </fo:table-cell>
+                      </xsl:if>
+                      <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                        <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                          <xsl:value-of select="@dnupro" />
+                        </fo:block>
+                      </fo:table-cell>
+                    </fo:table-row>
+                  </xsl:for-each>
+                </xsl:for-each>
+              </fo:table-body>
+            </fo:table>
+          </xsl:if>
+          <!-- .........................................Propri�taire de B�tis, mode Restreint................................................. -->
+          <fo:block color="#F1B4B4">
+            <fo:leader leader-length="100%" leader-pattern="rule"/>
+          </fo:block>
+          <fo:block text-align="left" vertical-align="middle" font-size="13pt" color="#990000">
+            Propri�taire(s) du local
+          </fo:block>
+
+          <fo:table margin-bottom="35px" table-layout="fixed" width="100%" border-separation="2" >
+            
+            <fo:table-column column-width="15%" />
+            <fo:table-column column-width="35%" />
+            <fo:table-column column-width="35%" />
+            <fo:table-column column-width="15%" />
+
+            <fo:table-body>
+              <fo:table-row>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Compte</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Nom</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Adresse</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Type</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+              <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Bati/Mj_Proprietaire">
+                <fo:table-row>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block color="blue" text-decoration="underline" text-align="left" vertical-align="middle" font-size="9pt">
+                      <fo:basic-link>
+                        <xsl:attribute name="external-destination">
+                          http://localhost/rgd/rgdservices.phtml?operation=GetReleveprop&amp;compte=<xsl:value-of select="@dnupro"/>&amp;type=restreint&amp;format=pdf&amp;version=1.0
+                        </xsl:attribute>
+                        <xsl:value-of select="@dnupro" />
+                      </fo:basic-link>
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@proprietaire_nom_tiers" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@proprietaire_adresse" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@l_ccodro" />
+                    </fo:block>
+                  </fo:table-cell>
+                </fo:table-row>
+              </xsl:for-each>
+            </fo:table-body>
+          </fo:table>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </xsl:template>
+</xsl:stylesheet>
+
+
diff --git a/src/module_cadastre/web_service/class/majic_lib/xsl/FP_fo_SansNom.xsl b/src/module_cadastre/web_service/class/majic_lib/xsl/FP_fo_SansNom.xsl
new file mode 100755
index 0000000000000000000000000000000000000000..59e985cc72f7919904c9c156725c4a94c03e1f15
--- /dev/null
+++ b/src/module_cadastre/web_service/class/majic_lib/xsl/FP_fo_SansNom.xsl
@@ -0,0 +1,394 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  <xsl:template match="/">
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="simple" page-width="21cm" page-height="29.7cm" margin-top="0.5cm" margin-bottom="0.5cm" margin-left="0.5cm" margin-right="0.5cm">
+          <fo:region-body margin-top="0cm" margin-bottom="0cm" margin-left="0.5cm" margin-right="0.5cm" />
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+
+      <fo:page-sequence master-reference="simple" font-family="Times">
+        <!-- Tableau global bas� sur la structure de la premi�re ligne du relev� de propri�t� -->
+        <fo:flow flow-name="xsl-region-body">
+          
+          <fo:block >
+            <fo:external-graphic >
+              <xsl:attribute name="src">
+                file:///C:\serveurs\Apache2\htdocs\rgd\images\bandeau.jpg
+              </xsl:attribute>
+            </fo:external-graphic>
+          </fo:block>
+
+          <fo:block color="#F1B4B4">
+            <fo:leader leader-length="100%" leader-pattern="rule"/>
+          </fo:block>
+          <fo:block text-align="left" vertical-align="middle" font-size="17pt" color="#008393">
+            <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle">
+              Parcelle <xsl:value-of select="@section" /><xsl:value-of select="format-number(@num_parc, '0000')"/> 
+            </xsl:for-each>
+          </fo:block>
+          <fo:block color="#F1B4B4">
+            <fo:leader leader-length="100%" leader-pattern="rule"/>
+          </fo:block>
+          <fo:table margin-bottom="35px" table-layout="fixed" width="100%" border-separation="2" >
+            <fo:table-column column-width="17%" />
+            <fo:table-column column-width="83%" />
+            <fo:table-body>
+              <fo:table-row>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Adresse :</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#F7F7F7" text-align="left"  padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@num_voirie" />
+                      <xsl:value-of select="@adresse" />
+                    </fo:block>
+                  </xsl:for-each>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Commune :</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#F7F7F7" text-align="left"  padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@libcom" />
+                    </fo:block>
+                  </xsl:for-each>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Code Commune (Insee) :</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#F7F7F7" text-align="left"  padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@codeinsee" />
+                    </fo:block>
+                  </xsl:for-each>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Cpte Propri�taire :</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#F7F7F7" text-align="left"  padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="Mj_Parcelle/@dnupro" />
+                    </fo:block>
+                    <!-- retour chariot -->
+                  </xsl:for-each>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Surface cadastrale (m�) :</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#F7F7F7" text-align="left"  padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@total_contenance_m2" />
+                    </fo:block>
+                  </xsl:for-each>
+                </fo:table-cell>
+              </fo:table-row>
+
+              <fo:table-row>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Urbaine :</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#F7F7F7" text-align="left"  padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@gurbpa" />
+                    </fo:block>
+                  </xsl:for-each>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">B�tie :</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#F7F7F7" text-align="left"  padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@gparbat" />
+                    </fo:block>
+                  </xsl:for-each>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Parcelle primitive :</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#F7F7F7" text-align="left"  padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:if test="not(@num_parc_prim = '')">
+                        <xsl:value-of select="@num_parc_prim" />
+                      </xsl:if>
+                      <xsl:if test="@num_parc_prim = ''">
+                        -
+                      </xsl:if>
+                    </fo:block>
+                  </xsl:for-each>
+                </fo:table-cell>
+              </fo:table-row>
+            </fo:table-body>
+          </fo:table>
+
+          <!--<fo:block>
+            <fo:external-graphic>
+              <xsl:attribute name="src">
+                http://mapsrv.rgd74.fr/geomap70/mg/net/ggGetMapImage.aspx?USER=Administrator&amp;PWD=admin&amp;MAPNAME=Library://RISNET_GESTION/Cartes/RGD 73-74 - RISNET_GESTION_73_74.MapDefinition&amp;SELOBJS=PARCELLE%2C<xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle">
+                  <xsl:value-of select='substring(@idpar,1,2)'/>
+                  <xsl:value-of select='substring(@idpar,4,3)'/>
+                  <xsl:if test ="substring(@idpar,7,3)='000'">
+                    <xsl:text disable-output-escaping="yes">-.-.-</xsl:text>
+                  </xsl:if>
+                  <xsl:if test ="not(substring(@idpar,7,3)='000')">
+                    <xsl:value-of select='substring(@idpar,7,3)'/>
+                  </xsl:if>
+                  <xsl:if test ="substring(@idpar,10,1)='0'">
+                    <xsl:text disable-output-escaping="yes">-</xsl:text>
+                  </xsl:if>
+                  <xsl:if test ="not(substring(@idpar,10,1)='0')">
+                    <xsl:value-of select='substring(@idpar,10,1)'/>
+                  </xsl:if>
+                  <xsl:value-of select='substring(@idpar,11,1)'/>
+                  <xsl:value-of select='substring(@idpar,12)'/>
+                </xsl:for-each>-&amp;CENTERX=&amp;CENTERY=&amp;SCALE=*8&amp;HEIGHT=400&amp;WIDTH=575&amp;RESULTTYPE=JPG
+              </xsl:attribute>
+            </fo:external-graphic>
+          </fo:block>-->
+          <fo:block text-align="left" vertical-align="middle" font-size="13pt" color="#990000">
+            Urbanisme : POS/PLU
+          </fo:block>
+            
+          <fo:table margin-bottom="35px" table-layout="fixed" width="100%" border-separation="2">
+            <fo:table-column column-width="9%" />
+            <fo:table-column column-width="27.48%" />
+            <fo:table-column column-width="15.38%" />
+            <fo:table-column column-width="7.29%" />
+            <fo:table-column column-width="7.29%" />
+            <fo:table-column column-width="9.79%" />
+            <fo:table-column column-width="23.77%" />
+
+            <fo:table-body>
+              <fo:table-row>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Zonage</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Libell�</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Surface (m2)*</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">COS</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">CES</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Hauteur</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">R�glement de la zone</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+              <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle/Mj_PosPlu">
+                <fo:table-row>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@zonage" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@lib_zonage" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@surface" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@cos" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@ces" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@hauteur" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block color="blue" text-decoration="underline" text-align="left" vertical-align="middle" font-size="9pt">
+                      <fo:basic-link>
+                        <xsl:attribute name="external-destination">
+                          http://mapris.rgd74.fr/DocumentsPartenaires/Reglement_POS/ <xsl:value-of select="@idreg" />.pdf
+                        </xsl:attribute>Consulter le r�glement
+                      </fo:basic-link>
+                    </fo:block>
+                  </fo:table-cell>
+                </fo:table-row>
+              </xsl:for-each>
+            </fo:table-body>
+          </fo:table>
+          <fo:block text-align="left" vertical-align="middle" font-size="8pt">
+            *calcul sur la surface graphique, exclusion si surf &#139; 2 m�
+          </fo:block>
+          <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle/Mj_PosPlu">
+            <fo:block color="blue" text-decoration="underline" text-align="left" vertical-align="middle" font-size="9pt">
+              <fo:basic-link>
+                <xsl:attribute name="external-destination">
+                  http://mapris.rgd74.fr/Risnet_Gestion/Application/Rapport/etat_pos_plu/fiche_pos.asp?codcom=<xsl:value-of select="@codecom" />
+                </xsl:attribute>Avancement de l'actualisation/mise en ligne du POS/PLU de cette commune
+              </fo:basic-link>
+            </fo:block>
+          </xsl:for-each>
+		  
+          <fo:block color="#F1B4B4">
+            <fo:leader leader-length="100%" leader-pattern="rule"/>
+          </fo:block>
+          
+          <fo:block text-align="left" vertical-align="middle" font-size="13pt" color="#990000">
+            Subdivision(s) fiscale(s)
+          </fo:block>
+          <fo:table margin-bottom="35px" table-layout="fixed" width="100%" border-separation="2">
+
+            <fo:table-column column-width="11%" />
+            <fo:table-column column-width="11%" />
+            <fo:table-column column-width="11%" />
+            <fo:table-column column-width="11.2%" />
+            <fo:table-column column-width="11%" />
+            <fo:table-column column-width="11.2%" />
+            <fo:table-column column-width="11.2%" />
+            <fo:table-column column-width="11.2%" />
+            <fo:table-column column-width="11.2%" />
+
+            <fo:table-body>
+              <fo:table-row>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Lettre</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Groupe</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Nature</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Occupation</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Classe</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Compte</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Surface (m�)</fo:block>
+                </fo:table-cell>
+
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Revenu (?)</fo:block>
+                </fo:table-cell>
+
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">R�f�rence</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+              <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle/Mj_Suf">
+                <fo:table-row>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:if test="not(@suf = '')">
+                        <xsl:value-of select="@suf" />
+                      </xsl:if>
+                      <xsl:if test="@suf = ''">
+                        -
+                      </xsl:if>
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:if test="not(@groupe = '')">
+                        <xsl:value-of select="@groupe" />
+                      </xsl:if>
+                      <xsl:if test="@groupe = ''">
+                        -
+                      </xsl:if>
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:if test="not(@nature = '')">
+                        <xsl:value-of select="@nature" />
+                      </xsl:if>
+                      <xsl:if test="@nature = ''">
+                        -
+                      </xsl:if>
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">-</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:if test="not(@clas = '')">
+                        <xsl:value-of select="@clas" />
+                      </xsl:if>
+                      <xsl:if test="@clas = ''">
+                        -
+                      </xsl:if>
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@dnupro" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@contenance_suf" />
+                    </fo:block>
+                  </fo:table-cell>
+
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@revenu_cadastral_txt" />
+                    </fo:block>
+                  </fo:table-cell>
+
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@revenu_reference_txt" />
+                    </fo:block>
+                  </fo:table-cell>
+                </fo:table-row>
+              </xsl:for-each>
+            </fo:table-body>
+          </fo:table>
+          
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </xsl:template>
+</xsl:stylesheet>
+
+
diff --git a/src/module_cadastre/web_service/class/majic_lib/xsl/Mj_Rapport.xsl b/src/module_cadastre/web_service/class/majic_lib/xsl/Mj_Rapport.xsl
new file mode 100755
index 0000000000000000000000000000000000000000..0df5da5c1adf6611a593f3597bd5a88159fc42f1
--- /dev/null
+++ b/src/module_cadastre/web_service/class/majic_lib/xsl/Mj_Rapport.xsl
@@ -0,0 +1,303 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+<xsl:template match="Rapport_Parcelle">
+	<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+		<fo:layout-master-set>
+			<fo:simple-page-master master-name="simple" page-height="29.7cm" page-width="21cm" margin-top="0.5cm" margin-bottom="0.5cm" margin-left="0.2cm" margin-right="0.2cm">
+				<fo:region-body region-name="Content" margin="0.2cm 0.2cm 0.2cm 0.2cm"></fo:region-body>
+				<fo:region-after region-name="Footer" extent="0.5in"></fo:region-after>
+			</fo:simple-page-master>
+		</fo:layout-master-set>
+	<fo:page-sequence master-reference="simple" font-family="Helvetica">
+
+	<!-- Début du pied de page qui se retrouvera sur chaque page -->
+		<fo:static-content flow-name="Footer">
+			<fo:block text-align="right" font-size="6pt">
+				Page <fo:page-number />
+			</fo:block>
+
+			<fo:block text-align="right" font-size="6pt">
+				<xsl:value-of select="Mj_Compte_Communal_Parcelles/Mj_Compte_Communal_Parcelle/Mj_Parcelle/@dateheure" />
+			</fo:block>
+		</fo:static-content>
+	<!-- Fin du pied de page -->
+
+	<fo:flow flow-name="Content">
+
+	<fo:block>
+
+	<!-- Création du contenu de la page pour chaque Mj_Compte_Communal_Parcelle trouvé -->
+
+	<xsl:for-each select="Mj_Compte_Communal_Parcelles">
+
+	<fo:table table-layout="fixed" border-collapse="collapse">
+	<fo:table-body>
+		<fo:table-row height="4cm">
+			<!--fo:table-cell><fo:block><fo:external-graphic src="C:/serveurs/Apache2/htdocs/lib/majic_lib/pics_for_xsl/blason.bmp" content-height="2.5cm"/></fo:block></fo:table-cell-->
+			<fo:table-cell><fo:block  font-weight="bold" text-align="center" font-size="14pt">Rapport de parcelles</fo:block></fo:table-cell>
+		</fo:table-row>
+	</fo:table-body>
+	</fo:table>
+	<xsl:for-each select="./Mj_Compte_Communal_Parcelle">
+	<fo:block border-color="black" border-style="double" border-width="1pt">
+
+	<fo:table table-layout="fixed" width="100%" border-collapse="collapse" font-size="10pt">
+
+	<fo:table-body>
+
+		<!-- Tableau d'affichage des informations de la parcelle -->
+		<fo:table-row height="1cm">
+			<fo:table-cell><fo:block font-weight="bold">PARCELLE</fo:block></fo:table-cell>
+			<fo:table-cell><fo:block><xsl:value-of select="./Mj_Parcelle/@idpar" /></fo:block></fo:table-cell>
+		</fo:table-row>
+		<fo:table-row>
+			<fo:table-cell><fo:block>Adresse</fo:block></fo:table-cell>
+			<fo:table-cell>
+				<xsl:if test="normalize-space(./Mj_Parcelle/@num_voirie) != '' ">
+					<fo:block><xsl:value-of select="./Mj_Parcelle/@num_voirie" />, </fo:block>
+				</xsl:if>
+				<fo:block> <xsl:value-of select="./Mj_Parcelle/@adresse" />, </fo:block>
+				<fo:block> <xsl:value-of select="@libcom" /></fo:block>
+			</fo:table-cell>
+		</fo:table-row>
+		<fo:table-row>
+			<fo:table-cell><fo:block>Surface cadastrale</fo:block></fo:table-cell>
+			<fo:table-cell><fo:block><xsl:value-of select="./Mj_Parcelle/@contenance" /> m²</fo:block></fo:table-cell>
+		</fo:table-row>
+		<fo:table-row>
+			<fo:table-cell><fo:block>Emprise batie</fo:block></fo:table-cell>
+			<fo:table-cell>
+				<xsl:if test="./Mj_Parcelle/Mj_Emprises/@titre = 'Emprise Bati' ">
+					<xsl:if test="./Mj_Parcelle/Mj_Emprises[@titre='Emprise Bati']/@emprise_totale_intersect != '' ">
+						<fo:block><xsl:value-of select="./Mj_Parcelle/Mj_Emprises[@titre='Emprise Bati']/@emprise_totale_intersect" /> m² = <xsl:value-of select="./Mj_Parcelle/Mj_Emprises[@titre='Emprise Bati']/@emprise_totale_ratio" /> % </fo:block>
+					</xsl:if>
+				</xsl:if>
+				<fo:block></fo:block>
+			</fo:table-cell>
+		</fo:table-row>
+		<fo:table-row>
+			<fo:table-cell><fo:block>Emprise non-batie</fo:block></fo:table-cell>
+			<fo:table-cell>
+				<xsl:if test="./Mj_Parcelle/Mj_Emprises/@titre = 'Emprise Bati' ">
+					<xsl:if test="./Mj_Parcelle/Mj_Emprises[@titre='Emprise Bati']/@emprise_totale_intersect != '' ">
+						<fo:block>
+						<xsl:variable name="surf_parcelle" select="./Mj_Parcelle/@contenance"/>
+						<xsl:variable name="surf_emprisebati" select="./Mj_Parcelle/Mj_Emprises[@titre='Emprise Bati']/@emprise_totale_intersect"/>
+						<xsl:variable name="res" select="round((($surf_parcelle - $surf_emprisebati)*100))*0.01"/>
+
+						<xsl:variable name="ratio_emprisebati" select="./Mj_Parcelle/Mj_Emprises[@titre='Emprise Bati']/@emprise_totale_ratio"/>
+						<xsl:variable name="resratio" select="100 - $ratio_emprisebati"/>
+
+						<xsl:value-of select="$res" /> m² = <xsl:value-of select="$resratio" /> %</fo:block>
+					</xsl:if>
+				</xsl:if>
+				<fo:block></fo:block>
+			</fo:table-cell>
+		</fo:table-row>
+		<fo:table-row height="1cm">
+			<fo:table-cell><fo:block>Compte propriétaire</fo:block></fo:table-cell>
+			<fo:table-cell><fo:block><xsl:value-of select="./Mj_Parcelle/@dnupro" /></fo:block></fo:table-cell>
+		</fo:table-row>
+
+		<!-- Tableau d'affichage des propriétaires de la parcelle -->
+		<fo:table-row height="1cm">
+			<fo:table-cell><fo:block font-weight="bold">PROPRIÉTAIRE</fo:block></fo:table-cell>
+			<fo:table-cell><fo:block></fo:block></fo:table-cell>
+		</fo:table-row>
+		<xsl:for-each select="./Mj_Proprietaire">
+			<fo:table-row>
+				<fo:table-cell><fo:block>Nom</fo:block></fo:table-cell>
+				<fo:table-cell><fo:block><xsl:value-of select="@proprietaire_nom" /></fo:block></fo:table-cell>
+			</fo:table-row>
+			<fo:table-row height="1cm">
+				<fo:table-cell><fo:block>Adresse</fo:block></fo:table-cell>
+				<fo:table-cell><fo:block><xsl:value-of select="@proprietaire_adresse" /></fo:block></fo:table-cell>
+			</fo:table-row>
+		</xsl:for-each>
+
+		<!-- Tableau d'affichage des informations de la subdi. fiscale de la parcelle -->
+		<fo:table-row height="1cm">
+			<fo:table-cell><fo:block font-weight="bold">SUBDIVISION FISCALE</fo:block></fo:table-cell>
+			<fo:table-cell><fo:block></fo:block></fo:table-cell>
+		</fo:table-row>
+		<fo:table-row>
+			<fo:table-cell><fo:block>Revenu</fo:block></fo:table-cell>
+			<fo:table-cell><fo:block><xsl:value-of select="./Mj_Parcelle/@revenu_cadastral" /> &#x20AC;</fo:block></fo:table-cell>
+		</fo:table-row>
+		<fo:table-row>
+			<fo:table-cell><fo:block>Surface</fo:block></fo:table-cell>
+			<fo:table-cell><fo:block><xsl:value-of select="./Mj_Parcelle/@contenance" /> m²</fo:block></fo:table-cell>
+		</fo:table-row>
+		<fo:table-row height="1cm">
+			<fo:table-cell><fo:block>Occupation</fo:block></fo:table-cell>
+			<fo:table-cell><fo:block><xsl:value-of select="./Mj_Parcelle/@grss_gr" /></fo:block></fo:table-cell>
+		</fo:table-row>
+
+		<!-- Tableau d'affichage des emprises de la parcelle -->
+		<fo:table-row height="1cm">
+			<fo:table-cell><fo:block font-weight="bold">EMPRISES</fo:block></fo:table-cell>
+			<fo:table-cell><fo:block></fo:block></fo:table-cell>
+		</fo:table-row>
+
+		<xsl:for-each select="./Mj_Parcelle/Mj_Emprises">
+			<xsl:if test="./@emprise_totale_intersect != 0 ">
+				<fo:table-row>
+					<fo:table-cell>
+						<fo:block><xsl:value-of select="./@titre" /></fo:block>
+					</fo:table-cell>
+					<fo:table-cell><fo:block></fo:block></fo:table-cell>
+				</fo:table-row>
+				<xsl:for-each select="./Mj_Emprise">
+					<fo:table-row>
+						<fo:table-cell><fo:block></fo:block></fo:table-cell>
+						<fo:table-cell>
+							<fo:block>
+								Pourcentage de la parcelle intersectée : <xsl:value-of select="./@emprise_ratio_label" />
+							</fo:block>
+						</fo:table-cell>
+					</fo:table-row>
+					<xsl:for-each select="./Mj_Attributes/Mj_Attribute">
+						<xsl:if test="./@title != '' ">
+							<fo:table-row>
+								<fo:table-cell><fo:block></fo:block></fo:table-cell>
+								<fo:table-cell>
+									<fo:block>
+										<xsl:value-of select="./@title" /> : <xsl:value-of select="./@value" />
+										<xsl:if test="./@label = 'intersect' "> m² </xsl:if>
+									</fo:block>
+								</fo:table-cell>
+							</fo:table-row>
+						</xsl:if>
+					</xsl:for-each>
+					<fo:table-row height="0.5cm">
+						<fo:table-cell><fo:block></fo:block></fo:table-cell>
+					</fo:table-row>
+				</xsl:for-each>
+			</xsl:if>
+		</xsl:for-each>
+
+		<fo:table-row height="1cm">
+			<fo:table-cell><fo:block></fo:block></fo:table-cell>
+		</fo:table-row>
+
+		<!-- Tableau d'affichage des locaux de la parcelle -->
+		<fo:table-row height="1cm">
+			<fo:table-cell><fo:block font-weight="bold">LOCAL</fo:block></fo:table-cell>
+			<fo:table-cell><fo:block></fo:block></fo:table-cell>
+		</fo:table-row>
+
+		<xsl:for-each select="./Mj_Bati">
+
+			<fo:table-row>
+				<fo:table-cell><fo:block>Adresse</fo:block></fo:table-cell>
+				<fo:table-cell><fo:block>Batiment <xsl:value-of select="@bat" />,Etage <xsl:value-of select="@niv" />,Porte <xsl:value-of select="@num_de_porte" />,<xsl:value-of select="voirie" />,<xsl:value-of select="@adresse" /></fo:block></fo:table-cell>
+			</fo:table-row>
+			<fo:table-row>
+				<fo:table-cell><fo:block>Type de local</fo:block></fo:table-cell>
+				<fo:table-cell><fo:block><xsl:value-of select="@nat_loc" /></fo:block></fo:table-cell>
+			</fo:table-row>
+			<fo:table-row>
+				<fo:table-cell><fo:block>Valeur locative</fo:block></fo:table-cell>
+				<fo:table-cell><fo:block><xsl:value-of select="@dvlpera" /> &#x20AC;</fo:block></fo:table-cell>
+			</fo:table-row>
+			<fo:table-row>
+				<fo:table-cell><fo:block>Millièmes et lots</fo:block></fo:table-cell>
+				<fo:table-cell><fo:block></fo:block></fo:table-cell>
+			</fo:table-row>
+			<fo:table-row height="1cm">
+				<fo:table-cell><fo:block>Compte propriétaire</fo:block></fo:table-cell>
+				<fo:table-cell><fo:block><xsl:value-of select="@b_dnupro" /></fo:block></fo:table-cell>
+			</fo:table-row>
+
+			<!-- affichage en tableau des propriétaires des locaux -->
+			<xsl:for-each select="./Mj_Proprietaire">
+				<fo:table-row>
+					<fo:table-cell>
+						<fo:table>
+						<fo:table-body>
+							<fo:table-row height="1.5cm">
+								<fo:table-cell width="2cm"><fo:block></fo:block></fo:table-cell>
+								<fo:table-cell width="5cm" font-size="9pt"><fo:block>Propriétaire local</fo:block></fo:table-cell>
+								<fo:table-cell width="13cm" font-size="9pt"><fo:block><xsl:value-of select="@proprietaire_nom" /> ; <xsl:value-of select="@proprietaire_adresse" /></fo:block></fo:table-cell>
+							</fo:table-row>
+						</fo:table-body>
+						</fo:table>
+					</fo:table-cell>
+				</fo:table-row>
+			</xsl:for-each>
+
+		</xsl:for-each>
+
+
+	</fo:table-body>
+
+	</fo:table>
+
+	</fo:block>
+
+	<!-- permet de sauter une page -->
+	<fo:block break-after="page"/>
+
+	</xsl:for-each>
+
+	<fo:block>
+		<fo:table>
+			<fo:table-body>
+				<fo:table-row height="1.5cm">
+					<fo:table-cell width="2cm"><fo:block></fo:block></fo:table-cell>
+					<fo:table-cell width="5cm" font-size="9pt"><fo:block font-weight="bold" >Totaux</fo:block></fo:table-cell>
+				</fo:table-row>
+			</fo:table-body>
+		</fo:table>
+	</fo:block>
+
+	<fo:block>
+		<fo:table>
+			<fo:table-body>
+				<fo:table-row height="1.5cm">
+					<fo:table-cell width="2cm"><fo:block></fo:block></fo:table-cell>
+					<fo:table-cell width="5cm" font-size="9pt"><fo:block>Surface cadastrale</fo:block></fo:table-cell>
+					<fo:table-cell width="13cm" font-size="9pt"><fo:block><xsl:value-of select="@Sum_contenance" /> m²</fo:block></fo:table-cell>
+				</fo:table-row>
+			</fo:table-body>
+		</fo:table>
+	</fo:block>
+
+	<fo:block>
+		<fo:table>
+			<fo:table-body>
+				<fo:table-row height="1.5cm">
+					<fo:table-cell width="2cm"><fo:block></fo:block></fo:table-cell>
+					<fo:table-cell width="5cm" font-size="9pt"><fo:block>Revenu</fo:block></fo:table-cell>
+					<fo:table-cell width="13cm" font-size="9pt"><fo:block><xsl:value-of select="@Sum_revenu" /> &#x20AC;</fo:block></fo:table-cell>
+				</fo:table-row>
+			</fo:table-body>
+		</fo:table>
+	</fo:block>
+
+	<fo:block>
+		<fo:table>
+			<fo:table-body>
+				<fo:table-row height="1.5cm">
+					<fo:table-cell width="2cm"><fo:block></fo:block></fo:table-cell>
+					<fo:table-cell width="5cm" font-size="9pt"><fo:block>Valeur locative</fo:block></fo:table-cell>
+					<fo:table-cell width="13cm" font-size="9pt"><fo:block><xsl:value-of select="@Sum_valeur_locative" /> &#x20AC;</fo:block></fo:table-cell>
+				</fo:table-row>
+			</fo:table-body>
+		</fo:table>
+	</fo:block>
+
+	</xsl:for-each>
+
+	</fo:block>
+
+	</fo:flow>
+
+	</fo:page-sequence>
+
+	</fo:root>
+
+</xsl:template>
+
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/src/module_cadastre/web_service/class/majic_lib/xsl/Mj_Rapport_Parcelle_BatieNonBatie.xsl b/src/module_cadastre/web_service/class/majic_lib/xsl/Mj_Rapport_Parcelle_BatieNonBatie.xsl
new file mode 100755
index 0000000000000000000000000000000000000000..a440086602e69804df707989e6e0d1067d4fe63e
--- /dev/null
+++ b/src/module_cadastre/web_service/class/majic_lib/xsl/Mj_Rapport_Parcelle_BatieNonBatie.xsl
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding='utf-8' ?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:output method="xml" indent="yes"/>
+<xsl:template match="Rapport_Parcelle">
+<?mso-application progid="Excel.Sheet"?>
+	<Workbook xmlns="urn:schemas-microsoft-com:office:spreadsheet"
+		xmlns:o="urn:schemas-microsoft-com:office:office"
+		xmlns:x="urn:schemas-microsoft-com:office:excel"
+		xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet"
+		xmlns:html="http://www.w3.org/TR/REC-html40">
+		<DocumentProperties xmlns="urn:schemas-microsoft-com:office:office">
+			<Author>Veremap.pro</Author>
+			<LastAuthor>Veremap.pro</LastAuthor>
+			<Company>Veremes</Company>
+		</DocumentProperties>
+		<ExcelWorkbook xmlns="urn:schemas-microsoft-com:office:excel">
+			<WindowHeight>12300</WindowHeight>
+			<WindowWidth>18915</WindowWidth>
+			<WindowTopX>120</WindowTopX>
+			<WindowTopY>105</WindowTopY>
+			<ProtectStructure>False</ProtectStructure>
+			<ProtectWindows>False</ProtectWindows>
+		</ExcelWorkbook>
+		<Styles>
+			<Style ss:ID="Default" ss:Name="Normal">
+				<Alignment ss:Vertical="Bottom"/>
+				<Borders/>
+				<Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="11" ss:Color="#000000"/>
+				<Interior/>
+				<NumberFormat/>
+				<Protection/>
+			</Style>
+
+			<Style	ss:ID="s63">
+				<Alignment	ss:Horizontal="Center"	ss:Vertical="Bottom"/>
+				<Borders>
+					<Border	ss:Position="Bottom"	ss:LineStyle="Continuous"	ss:Weight="2"/>
+					<Border	ss:Position="Left"	ss:LineStyle="Continuous"	ss:Weight="2"/>
+					<Border	ss:Position="Top"	ss:LineStyle="Continuous"	ss:Weight="2"/>
+				</Borders>
+			</Style>
+			<Style	ss:ID="s64">
+				<Alignment	ss:Horizontal="Center"	ss:Vertical="Bottom"/>
+				<Borders>
+					<Border	ss:Position="Bottom"	ss:LineStyle="Continuous"	ss:Weight="2"/>
+					<Border	ss:Position="Left"	ss:LineStyle="Continuous"	ss:Weight="2"/>
+					<Border	ss:Position="Right"	ss:LineStyle="Continuous"	ss:Weight="2"/>
+					<Border	ss:Position="Top"	ss:LineStyle="Continuous"	ss:Weight="2"/>
+				</Borders>
+			</Style>
+			<Style	ss:ID="s65">
+				<Alignment	ss:Horizontal="Center"	ss:Vertical="Bottom"/>
+			</Style>
+
+		</Styles>
+		 <Worksheet ss:Name="Feuil1">
+			<!--<xsl:variable name="nb_ligne"><xsl:value-of select="./XmlMapLog/XmlLog/@nb_ligne" /></xsl:variable>-->
+			<Table ss:ExpandedColumnCount="7" x:FullColumns="1" x:FullRows="1" ss:DefaultColumnWidth="60" ss:DefaultRowHeight="15">
+				<!--<xsl:attribute name="ss:ExpandedRowCount"><xsl:value-of select="1000" /></xsl:attribute>-->
+				<Column ss:AutoFitWidth="0" ss:Width="103.5"/>
+				<Column ss:AutoFitWidth="0" ss:Width="105"/>
+				<Column ss:AutoFitWidth="0" ss:Width="119.25"/><!--<Column ss:Index="4" ss:AutoFitWidth="0" ss:Width="63.75"/>-->
+				<Column ss:AutoFitWidth="0" ss:Width="119.25"/>
+				<Column ss:AutoFitWidth="0" ss:Width="127.5"/>
+				<Column ss:AutoFitWidth="0" ss:Width="119.25"/>
+				<Column ss:AutoFitWidth="0" ss:Width="127.5"/>
+
+					<Row	ss:AutoFitHeight="0"	ss:Height="15.75">
+						<Cell	ss:MergeAcross="2"	ss:StyleID="s63"><Data ss:Type="String">PARCELLES</Data></Cell>
+						<Cell	ss:MergeAcross="3"	ss:StyleID="s64"><Data ss:Type="String">EMPRISES</Data></Cell>
+					</Row>
+
+					<Row ss:AutoFitHeight="0">
+						<Cell	ss:StyleID="s65"><Data ss:Type="String">Parcelle</Data></Cell>
+						<Cell	ss:StyleID="s65"><Data ss:Type="String">Adresse</Data></Cell> 
+						<Cell	ss:StyleID="s65"><Data ss:Type="String">Surface cadastrale (m²)</Data></Cell>
+						<Cell	ss:StyleID="s65"><Data ss:Type="String">Emprise bâtie (m²)</Data></Cell>
+						<Cell	ss:StyleID="s65"><Data ss:Type="String">Emprise bâtie (%)</Data></Cell>
+						<Cell	ss:StyleID="s65"><Data ss:Type="String">Emprise non bâtie (m²)</Data></Cell>
+						<Cell	ss:StyleID="s65"><Data ss:Type="String">Emprise non bâtie (%)</Data></Cell>
+					</Row>
+					<xsl:for-each select="Mj_Compte_Communal_Parcelles/Mj_Compte_Communal_Parcelle">
+
+						<Row ss:AutoFitHeight="0"> 
+							<Cell><Data ss:Type="String"><xsl:value-of select="./Mj_Parcelle/@idpar" /></Data></Cell>
+							<Cell><Data ss:Type="String"><xsl:value-of select="./Mj_Parcelle/@adresse" /></Data></Cell>
+							<Cell><Data ss:Type="Number"><xsl:value-of select="./Mj_Parcelle/@contenance" /></Data></Cell>
+							<Cell>
+								<Data ss:Type="Number">
+									<xsl:if test="./Mj_Parcelle/Mj_Emprises/@titre = 'Emprise Bati' ">
+										<xsl:if test="./Mj_Parcelle/Mj_Emprises[@titre='Emprise Bati']/@emprise_totale_intersect != '' ">
+											<xsl:value-of select="./Mj_Parcelle/Mj_Emprises[@titre='Emprise Bati']/@emprise_totale_intersect" />
+										</xsl:if>
+									</xsl:if>
+								</Data>
+							</Cell>	
+							<Cell>
+								<Data ss:Type="Number">
+
+									<xsl:if test="./Mj_Parcelle/Mj_Emprises/@titre = 'Emprise Bati' ">
+										<xsl:if test="./Mj_Parcelle/Mj_Emprises[@titre='Emprise Bati']/@emprise_totale_intersect != '' ">
+											<xsl:value-of select="./Mj_Parcelle/Mj_Emprises[@titre='Emprise Bati']/@emprise_totale_ratio" />
+										</xsl:if>
+									</xsl:if>
+								</Data>
+							</Cell>
+
+							<Cell>
+								<Data ss:Type="Number">
+									<xsl:if test="./Mj_Parcelle/Mj_Emprises/@titre = 'Emprise Bati' ">
+										<xsl:if test="./Mj_Parcelle/Mj_Emprises[@titre='Emprise Bati']/@emprise_totale_intersect != '' ">
+											<xsl:variable name="surf_parcelle" select="./Mj_Parcelle/@contenance"/>
+											<xsl:variable name="surf_emprisebati" select="./Mj_Parcelle/Mj_Emprises[@titre='Emprise Bati']/@emprise_totale_intersect"/>
+											<xsl:variable name="res" select="round((($surf_parcelle - $surf_emprisebati)*100))*0.01"/>
+											<xsl:value-of select="$res" />
+										</xsl:if>
+									</xsl:if>
+								</Data>
+							</Cell>
+
+							<Cell>
+								<Data ss:Type="Number">
+								
+									<xsl:if test="./Mj_Parcelle/Mj_Emprises/@titre = 'Emprise Bati' ">
+										<xsl:if test="./Mj_Parcelle/Mj_Emprises[@titre='Emprise Bati']/@emprise_totale_intersect != '' ">
+											<xsl:variable name="ratio_emprisebati" select="./Mj_Parcelle/Mj_Emprises[@titre='Emprise Bati']/@emprise_totale_ratio"/>
+											<xsl:variable name="resratio" select="100 - $ratio_emprisebati"/>
+											<xsl:value-of select="$resratio" />
+										</xsl:if>
+									</xsl:if>
+								</Data>
+							</Cell>
+						</Row>
+						
+
+					</xsl:for-each>
+
+					<Row ss:AutoFitHeight="0">	
+						<Cell><Data ss:Type="String">TOTAUX</Data></Cell>
+						<Cell><Data ss:Type="String"></Data></Cell>
+						<Cell><Data ss:Type="Number"><xsl:value-of select="./Mj_Compte_Communal_Parcelles/@Sum_contenance_m2" /></Data></Cell>
+						<Cell><Data ss:Type="Number"><xsl:value-of select="./Mj_Compte_Communal_Parcelles/@Sum_contenance_bati" /></Data></Cell>
+						<Cell><Data ss:Type="String"></Data></Cell>
+						<Cell>
+							<Data ss:Type="String">
+								<xsl:variable name="sum_contenance" select="./Mj_Compte_Communal_Parcelles/@Sum_contenance_m2"/>
+								<xsl:variable name="sum_contenance_bati" select="./Mj_Compte_Communal_Parcelles/@Sum_contenance_bati"/>
+								<xsl:variable name="sum_contenance_non_bati" select="$sum_contenance - $sum_contenance_bati"/>
+								<xsl:value-of select="$sum_contenance_non_bati" />	
+							</Data>
+						</Cell>
+						<Cell><Data ss:Type="String"></Data></Cell>	
+					</Row>
+
+			</Table>
+			<WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">
+				<PageSetup>
+					<Header x:Margin="0.3"/>
+					<Footer x:Margin="0.3"/>
+					<PageMargins x:Bottom="0.75" x:Left="0.7" x:Right="0.7" x:Top="0.75"/>
+				</PageSetup>
+				<Unsynced/>
+				<Print>
+					<ValidPrinterInfo/>
+					<PaperSizeIndex>9</PaperSizeIndex>
+					<HorizontalResolution>600</HorizontalResolution>
+					<VerticalResolution>600</VerticalResolution>
+				</Print>
+				<Selected/>
+				<ProtectObjects>False</ProtectObjects>
+				<ProtectScenarios>False</ProtectScenarios>
+			</WorksheetOptions>
+		 </Worksheet>
+	</Workbook>
+</xsl:template>
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/src/module_cadastre/web_service/class/majic_lib/xsl/Mj_Rapport_Parcelle_EmprisePosPlu.xsl b/src/module_cadastre/web_service/class/majic_lib/xsl/Mj_Rapport_Parcelle_EmprisePosPlu.xsl
new file mode 100755
index 0000000000000000000000000000000000000000..a2d8011841189ac04dac61ddea0918030b3430e6
--- /dev/null
+++ b/src/module_cadastre/web_service/class/majic_lib/xsl/Mj_Rapport_Parcelle_EmprisePosPlu.xsl
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding='utf-8' ?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:output method="xml" indent="yes"/>
+<xsl:template match="Rapport_Parcelle">
+<?mso-application progid="Excel.Sheet"?>
+	<Workbook xmlns="urn:schemas-microsoft-com:office:spreadsheet"
+		xmlns:o="urn:schemas-microsoft-com:office:office"
+		xmlns:x="urn:schemas-microsoft-com:office:excel"
+		xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet"
+		xmlns:html="http://www.w3.org/TR/REC-html40">
+		<DocumentProperties xmlns="urn:schemas-microsoft-com:office:office">
+			<Author>Veremap.pro</Author>
+			<LastAuthor>Veremap.pro</LastAuthor>
+			<Company>Veremes</Company>
+		</DocumentProperties>
+		<ExcelWorkbook xmlns="urn:schemas-microsoft-com:office:excel">
+			<WindowHeight>12300</WindowHeight>
+			<WindowWidth>18915</WindowWidth>
+			<WindowTopX>120</WindowTopX>
+			<WindowTopY>105</WindowTopY>
+			<ProtectStructure>False</ProtectStructure>
+			<ProtectWindows>False</ProtectWindows>
+		</ExcelWorkbook>
+		<Styles>
+			<Style ss:ID="Default" ss:Name="Normal">
+				<Alignment ss:Vertical="Bottom"/>
+				<Borders/>
+				<Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="11" ss:Color="#000000"/>
+				<Interior/>
+				<NumberFormat/>
+				<Protection/>
+			</Style>
+			<Style ss:ID="s61">
+				<Alignment ss:Vertical="Bottom" ss:WrapText="1"/>
+			</Style>
+			<Style ss:ID="s62">
+				<Alignment ss:Horizontal="Center" ss:WrapText="1"/>
+			</Style>
+			<Style ss:ID="s63">
+				<Alignment ss:Horizontal="Center" ss:Vertical="Bottom"/>
+				<Borders>
+					<Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/>
+					<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
+					<Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
+				</Borders>
+			</Style>
+			<Style ss:ID="s64">
+				<Alignment ss:Horizontal="Center" ss:Vertical="Bottom"/>
+				<Borders>
+					<Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/>
+					<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
+					<Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
+					<Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
+				</Borders>
+			</Style>
+			<Style ss:ID="s65">
+				<Alignment ss:Horizontal="Center" ss:Vertical="Bottom"/>
+			</Style>
+
+		</Styles>
+		<Worksheet ss:Name="Feuil1">
+			<Table ss:ExpandedColumnCount="40" x:FullColumns="1" x:FullRows="1" ss:DefaultColumnWidth="60" ss:DefaultRowHeight="15">
+				<Column ss:AutoFitWidth="0" ss:Width="103.5"/>
+				<Column ss:AutoFitWidth="0" ss:Width="105"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Row>
+					<Cell ss:MergeAcross="2" ss:StyleID="s64"><Data ss:Type="String">PARCELLES</Data></Cell>
+					<Cell ss:MergeAcross="6" ss:StyleID="s64"><Data ss:Type="String">EMPRISES</Data></Cell>
+				</Row>
+				<Row ss:AutoFitHeight="0">
+					<Cell ss:StyleID="s65"><Data ss:Type="String">Parcelle</Data></Cell>
+					<Cell ss:StyleID="s65"><Data ss:Type="String">Adresse</Data></Cell>
+					<Cell ss:StyleID="s65"><Data ss:Type="String">Surface cadastrale (m²)</Data></Cell>
+					<Cell ss:StyleID="s65"><Data ss:Type="String"></Data></Cell>
+					<Cell ss:StyleID="s65"><Data ss:Type="String"></Data></Cell>
+					<Cell ss:StyleID="s65"><Data ss:Type="String"></Data></Cell>
+					<Cell ss:StyleID="s65"><Data ss:Type="String"></Data></Cell>
+					<Cell ss:StyleID="s65"><Data ss:Type="String"></Data></Cell>
+					<Cell ss:StyleID="s65"><Data ss:Type="String"></Data></Cell>
+					<Cell ss:StyleID="s65"><Data ss:Type="String"></Data></Cell>
+				</Row>
+
+				<xsl:for-each select="Mj_Compte_Communal_Parcelles/Mj_Compte_Communal_Parcelle">
+					<Row ss:AutoFitHeight="0">
+						<Cell><Data ss:Type="String"><xsl:value-of select="./Mj_Parcelle/@idpar" /></Data></Cell>
+						<Cell><Data ss:Type="String"><xsl:value-of select="./Mj_Parcelle/@adresse" /></Data></Cell>
+						<Cell><Data ss:Type="Number"><xsl:value-of select="./Mj_Parcelle/@contenance" /></Data></Cell>
+						<xsl:for-each select="./Mj_Parcelle/Mj_Emprises">
+							<Cell><Data ss:Type="String"><xsl:value-of select="./@titre" /> :</Data></Cell>
+							<xsl:for-each select="./Mj_Emprise">
+								<Cell>
+									<Data ss:Type="String">Pourcentage de la parcelle intersectée : <xsl:value-of select="./@emprise_ratio_label" />,
+<xsl:for-each select="./Mj_Attributes/Mj_Attribute">
+											<xsl:if test="./@title != '' ">
+<xsl:value-of select="./@title" /> : <xsl:value-of select="./@value" /><xsl:if test="./@label = 'intersect' "> m²</xsl:if>,
+</xsl:if>
+										</xsl:for-each>
+									</Data>
+								</Cell>
+							</xsl:for-each>
+						</xsl:for-each>
+					</Row>
+				</xsl:for-each>
+
+				<Row ss:AutoFitHeight="0">
+					<Cell><Data ss:Type="String">TOTAUX</Data></Cell>
+					<Cell><Data ss:Type="String"></Data></Cell>
+					<Cell><Data ss:Type="Number"><xsl:value-of select="./Mj_Compte_Communal_Parcelles/@Sum_contenance_m2" /></Data></Cell>
+					<Cell><Data ss:Type="String"></Data></Cell>
+					<Cell><Data ss:Type="String"></Data></Cell>
+					<Cell><Data ss:Type="String"></Data></Cell>
+					<Cell><Data ss:Type="String"></Data></Cell>
+					<Cell><Data ss:Type="String"></Data></Cell>
+					<Cell><Data ss:Type="String"></Data></Cell>
+					<Cell><Data ss:Type="String"></Data></Cell>
+				</Row>
+			</Table>
+
+			<WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">
+				<PageSetup>
+					<Header x:Margin="0.3"/>
+					<Footer x:Margin="0.3"/>
+					<PageMargins x:Bottom="0.75" x:Left="0.7" x:Right="0.7" x:Top="0.75"/>
+				</PageSetup>
+				<Unsynced/>
+				<Print>
+					<ValidPrinterInfo/>
+					<PaperSizeIndex>9</PaperSizeIndex>
+					<HorizontalResolution>600</HorizontalResolution>
+					<VerticalResolution>600</VerticalResolution>
+				</Print>
+				<Selected/>
+				<ProtectObjects>False</ProtectObjects>
+				<ProtectScenarios>False</ProtectScenarios>
+			</WorksheetOptions>
+		 </Worksheet>
+	</Workbook>
+</xsl:template>
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/src/module_cadastre/web_service/class/majic_lib/xsl/Mj_Rapport_Parcelle_Locaux.xsl b/src/module_cadastre/web_service/class/majic_lib/xsl/Mj_Rapport_Parcelle_Locaux.xsl
new file mode 100755
index 0000000000000000000000000000000000000000..6ef49212c7e61b08bd7d914cfb1d0648eb0865b4
--- /dev/null
+++ b/src/module_cadastre/web_service/class/majic_lib/xsl/Mj_Rapport_Parcelle_Locaux.xsl
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding='utf-8' ?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:output method="xml" indent="yes"/>
+<xsl:template match="Rapport_Parcelle">
+<?mso-application progid="Excel.Sheet"?>
+	<Workbook xmlns="urn:schemas-microsoft-com:office:spreadsheet"
+		xmlns:o="urn:schemas-microsoft-com:office:office"
+		xmlns:x="urn:schemas-microsoft-com:office:excel"
+		xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet"
+		xmlns:html="http://www.w3.org/TR/REC-html40">
+		<DocumentProperties xmlns="urn:schemas-microsoft-com:office:office">
+			<Author>Veremap.pro</Author>
+			<LastAuthor>Veremap.pro</LastAuthor>
+			<Company>Veremes</Company>
+		</DocumentProperties>
+		<ExcelWorkbook xmlns="urn:schemas-microsoft-com:office:excel">
+			<WindowHeight>12300</WindowHeight>
+			<WindowWidth>18915</WindowWidth>
+			<WindowTopX>120</WindowTopX>
+			<WindowTopY>105</WindowTopY>
+			<ProtectStructure>False</ProtectStructure>
+			<ProtectWindows>False</ProtectWindows>
+		</ExcelWorkbook>
+		<Styles>
+			<Style ss:ID="Default" ss:Name="Normal">
+				<Alignment ss:Vertical="Bottom"/>
+				<Borders/>
+				<Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="11" ss:Color="#000000"/>
+				<Interior/>
+				<NumberFormat/>
+				<Protection/>
+			</Style>
+
+			<Style ss:ID="s63">
+				<Alignment ss:Horizontal="Center" ss:Vertical="Bottom"/>
+				<Borders>
+					<Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/>
+					<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
+					<Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
+				</Borders>
+			</Style>
+			<Style ss:ID="s64">
+				<Alignment ss:Horizontal="Center" ss:Vertical="Bottom"/>
+				<Borders>
+					<Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/>
+					<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
+					<Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
+					<Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
+				</Borders>
+			</Style>
+			<Style ss:ID="s65">
+				<Alignment ss:Horizontal="Center" ss:Vertical="Bottom"/>
+			</Style>
+
+		</Styles>
+		 <Worksheet ss:Name="Feuil1">
+			<Table ss:ExpandedColumnCount="7" x:FullColumns="1" x:FullRows="1" ss:DefaultColumnWidth="60" ss:DefaultRowHeight="15">
+				<Column ss:AutoFitWidth="0" ss:Width="85"/>
+				<Column ss:AutoFitWidth="0" ss:Width="125"/>
+				<Column ss:AutoFitWidth="0" ss:Width="115"/>
+				<Column ss:AutoFitWidth="0" ss:Width="135"/>
+				<Column ss:AutoFitWidth="0" ss:Width="115"/>
+				<Column ss:AutoFitWidth="0" ss:Width="105"/>
+				<Column ss:AutoFitWidth="0" ss:Width="90"/>
+
+				<Row ss:AutoFitHeight="0" ss:Height="15.75">
+					<Cell ss:MergeAcross="2" ss:StyleID="s63"><Data ss:Type="String">PARCELLES</Data></Cell>
+					<Cell ss:MergeAcross="3" ss:StyleID="s64"><Data ss:Type="String">LOCAUX</Data></Cell>
+				</Row>
+
+				<Row ss:AutoFitHeight="0" ss:StyleID="s65">
+					<Cell><Data ss:Type="String">Parcelle</Data></Cell>
+					<Cell><Data ss:Type="String">Adresse</Data></Cell> 
+					<Cell><Data ss:Type="String">Surface cadastrale (m²)</Data></Cell>
+					<Cell><Data ss:Type="String">Adresse local</Data></Cell>
+					<Cell><Data ss:Type="String">Type de local</Data></Cell>
+					<Cell><Data ss:Type="String">Valeur locative (Euros)</Data></Cell>
+					<Cell><Data ss:Type="String">Millièmes et lots</Data></Cell>
+				</Row>
+
+				<xsl:for-each select="Mj_Bati_Parcelles/Mj_Bati_Parcelle">
+					<Row ss:AutoFitHeight="0"> 
+						<Cell><Data ss:Type="String"><xsl:value-of select="@id_par" /></Data></Cell>
+						<Cell><Data ss:Type="String"><xsl:value-of select="@adresse" /></Data></Cell>
+						<Cell><Data ss:Type="Number"><xsl:value-of select="@contenance" /></Data></Cell>
+						<xsl:if test="./Mj_Bati/@bat != '' ">
+							<Cell><Data ss:Type="String"><xsl:value-of select="./Mj_Bati/@voirie" /> <xsl:value-of select="./Mj_Bati/@adresse" /></Data></Cell>
+							<Cell><Data ss:Type="String"><xsl:value-of select="./Mj_Bati/@dteloc" /></Data></Cell>
+							<Cell><Data ss:Type="Number"><xsl:value-of select="./Mj_Bati/@dvlpera" /></Data></Cell>
+							<xsl:if test="./Mj_Bati/@dnumql != '' ">
+								<Cell><Data ss:Type="String"><xsl:value-of select="./Mj_Bati/@dnumql" />/<xsl:value-of select="./Mj_Bati/@ddenql" /></Data></Cell>
+							</xsl:if>
+							<xsl:if test="./Mj_Bati/@dnumql = '' ">
+								<Cell><Data ss:Type="String"></Data></Cell>
+							</xsl:if>
+						</xsl:if>
+						<xsl:if test="./Mj_Bati/@bat = '' ">
+							<Cell><Data ss:Type="String"></Data></Cell>
+							<Cell><Data ss:Type="String"></Data></Cell>
+							<Cell><Data ss:Type="String"></Data></Cell>
+							<Cell><Data ss:Type="String"></Data></Cell>
+						</xsl:if>
+					</Row>
+					<xsl:for-each select="./Mj_Bati">
+						<xsl:if test="position()!=1">
+							<Row ss:AutoFitHeight="0">
+								<Cell><Data ss:Type="String"></Data></Cell>
+								<Cell><Data ss:Type="String"></Data></Cell>
+								<Cell><Data ss:Type="String"></Data></Cell>
+								<Cell><Data ss:Type="String"><xsl:value-of select="./@voirie" /> <xsl:value-of select="./@adresse" /></Data></Cell>
+								<Cell><Data ss:Type="String"><xsl:value-of select="./@dteloc" /></Data></Cell>
+								<Cell><Data ss:Type="Number"><xsl:value-of select="./@dvlpera" /></Data></Cell>
+								<xsl:if test="./@dnumql != '' ">
+									<Cell><Data ss:Type="String"><xsl:value-of select="./@dnumql" />/<xsl:value-of select="./@ddenql" /></Data></Cell>
+								</xsl:if>
+								<xsl:if test="./@dnumql = '' ">
+									<Cell><Data ss:Type="String"></Data></Cell>
+								</xsl:if>
+							</Row>
+						</xsl:if>
+					</xsl:for-each>
+				</xsl:for-each> 
+
+				<Row ss:AutoFitHeight="0">
+					<Cell><Data ss:Type="String">TOTAUX</Data></Cell>
+					<Cell><Data ss:Type="String"></Data></Cell>
+					<Cell><Data ss:Type="Number"><xsl:value-of select="./Mj_Bati_Parcelles/@sum_contenance_m2" /></Data></Cell>
+					<Cell><Data ss:Type="String"></Data></Cell>
+					<Cell><Data ss:Type="String"></Data></Cell>
+					<Cell><Data ss:Type="Number"><xsl:value-of select="./Mj_Bati_Parcelles/@sum_valeur_locative" /></Data></Cell>
+					<Cell><Data ss:Type="String"></Data></Cell>
+				</Row>
+
+			</Table>
+			<WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">
+				<PageSetup>
+					<Header x:Margin="0.3"/>
+					<Footer x:Margin="0.3"/>
+					<PageMargins x:Bottom="0.75" x:Left="0.7" x:Right="0.7" x:Top="0.75"/>
+				</PageSetup>
+				<Unsynced/>
+				<Print>
+					<ValidPrinterInfo/>
+					<PaperSizeIndex>9</PaperSizeIndex>
+					<HorizontalResolution>600</HorizontalResolution>
+					<VerticalResolution>600</VerticalResolution>
+				</Print>
+				<Selected/>
+				<ProtectObjects>False</ProtectObjects>
+				<ProtectScenarios>False</ProtectScenarios>
+			</WorksheetOptions>
+		</Worksheet>
+	</Workbook>
+</xsl:template>
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/src/module_cadastre/web_service/class/majic_lib/xsl/Mj_Rapport_Parcelle_Proprietaire.xsl b/src/module_cadastre/web_service/class/majic_lib/xsl/Mj_Rapport_Parcelle_Proprietaire.xsl
new file mode 100755
index 0000000000000000000000000000000000000000..32ded4b7ea8c4682c30a4a236d812ff6a632e04c
--- /dev/null
+++ b/src/module_cadastre/web_service/class/majic_lib/xsl/Mj_Rapport_Parcelle_Proprietaire.xsl
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding='utf-8' ?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:output method="xml" indent="yes"/>
+<xsl:template match="Rapport_Parcelle">
+<?mso-application progid="Excel.Sheet"?>
+	<Workbook xmlns="urn:schemas-microsoft-com:office:spreadsheet"
+		xmlns:o="urn:schemas-microsoft-com:office:office"
+		xmlns:x="urn:schemas-microsoft-com:office:excel"
+		xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet"
+		xmlns:html="http://www.w3.org/TR/REC-html40">
+		<DocumentProperties xmlns="urn:schemas-microsoft-com:office:office">
+			<Author>Veremap.pro</Author>
+			<LastAuthor>Veremap.pro</LastAuthor>
+			<Company>Veremes</Company>
+		</DocumentProperties>
+		<ExcelWorkbook xmlns="urn:schemas-microsoft-com:office:excel">
+			<WindowHeight>12300</WindowHeight>
+			<WindowWidth>18915</WindowWidth>
+			<WindowTopX>120</WindowTopX>
+			<WindowTopY>105</WindowTopY>
+			<ProtectStructure>False</ProtectStructure>
+			<ProtectWindows>False</ProtectWindows>
+		</ExcelWorkbook>
+		<Styles>
+			<Style ss:ID="Default" ss:Name="Normal">
+				<Alignment ss:Vertical="Bottom"/>
+				<Borders/>
+				<Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="11" ss:Color="#000000"/>
+				<Interior/>
+				<NumberFormat/>
+				<Protection/>
+			</Style>
+
+			<Style	ss:ID="s63">
+				<Alignment	ss:Horizontal="Center"	ss:Vertical="Bottom"/>
+				<Borders>
+					<Border	ss:Position="Bottom"	ss:LineStyle="Continuous"	ss:Weight="2"/>
+					<Border	ss:Position="Left"	ss:LineStyle="Continuous"	ss:Weight="2"/>
+					<Border	ss:Position="Top"	ss:LineStyle="Continuous"	ss:Weight="2"/>
+				</Borders>
+			</Style>
+			<Style	ss:ID="s64">
+				<Alignment	ss:Horizontal="Center"	ss:Vertical="Bottom"/>
+				<Borders>
+					<Border	ss:Position="Bottom"	ss:LineStyle="Continuous"	ss:Weight="2"/>
+					<Border	ss:Position="Left"	ss:LineStyle="Continuous"	ss:Weight="2"/>
+					<Border	ss:Position="Right"	ss:LineStyle="Continuous"	ss:Weight="2"/>
+					<Border	ss:Position="Top"	ss:LineStyle="Continuous"	ss:Weight="2"/>
+				</Borders>
+			</Style>
+			<Style	ss:ID="s65">
+				<Alignment	ss:Horizontal="Center"	ss:Vertical="Bottom"/>
+			</Style>
+
+		</Styles>
+		 <Worksheet ss:Name="Feuil1">
+			<!--<xsl:variable name="nb_ligne"><xsl:value-of select="./XmlMapLog/XmlLog/@nb_ligne" /></xsl:variable>-->
+			<Table ss:ExpandedColumnCount="6" x:FullColumns="1" x:FullRows="1" ss:DefaultColumnWidth="60" ss:DefaultRowHeight="15">
+				<!--<xsl:attribute name="ss:ExpandedRowCount"><xsl:value-of select="1000" /></xsl:attribute>-->
+				<Column ss:AutoFitWidth="0" ss:Width="103.5"/>
+				<Column ss:AutoFitWidth="0" ss:Width="105"/>
+				<Column ss:Index="4" ss:AutoFitWidth="0" ss:Width="63.75"/>
+				<Column ss:AutoFitWidth="0" ss:Width="119.25"/>
+				<Column ss:AutoFitWidth="0" ss:Width="127.5"/>
+
+					<Row	ss:AutoFitHeight="0"	ss:Height="15.75">
+						<Cell	ss:MergeAcross="2"	ss:StyleID="s63"><Data ss:Type="String">PARCELLES</Data></Cell>
+						<Cell	ss:MergeAcross="2"	ss:StyleID="s64"><Data ss:Type="String">PROPRIETAIRES</Data></Cell>
+					</Row>
+					<Row ss:AutoFitHeight="0">
+						<Cell	ss:StyleID="s65"><Data ss:Type="String">Parcelle</Data></Cell>
+						<Cell	ss:StyleID="s65"><Data ss:Type="String">Adresse</Data></Cell> 
+						<Cell	ss:StyleID="s65"><Data ss:Type="String">Surface cadastrale (m²)</Data></Cell>
+						<Cell	ss:StyleID="s65"><Data ss:Type="String">Compte propriétaire</Data></Cell>
+						<Cell	ss:StyleID="s65"><Data ss:Type="String">Nom</Data></Cell>
+						<Cell	ss:StyleID="s65"><Data ss:Type="String">Adresse</Data></Cell>
+					</Row>
+
+					<xsl:for-each select="Mj_Compte_Communal_Parcelles/Mj_Compte_Communal_Parcelle">
+
+						<Row ss:AutoFitHeight="0"> 
+							<Cell><Data ss:Type="String"><xsl:value-of select="./Mj_Parcelle/@idpar" /></Data></Cell>
+							<Cell><Data ss:Type="String"><xsl:value-of select="./Mj_Parcelle/@adresse" /></Data></Cell>
+							<Cell><Data ss:Type="Number"><xsl:value-of select="./Mj_Parcelle/@contenance" /></Data></Cell>
+							<Cell><Data ss:Type="String"><xsl:value-of select="./Mj_Proprietaire/@dnupro" /></Data></Cell>
+							<Cell><Data ss:Type="String"><xsl:value-of select="./Mj_Proprietaire/@proprietaire_nom" /></Data></Cell>
+							<Cell><Data ss:Type="String"><xsl:value-of select="./Mj_Proprietaire/@proprietaire_adresse" /></Data></Cell>
+						</Row>
+
+						<xsl:for-each select="./Mj_Proprietaire">
+							<xsl:if test="position()!=1">
+								<Row ss:AutoFitHeight="0">
+									<Cell><Data ss:Type="String"></Data></Cell>
+									<Cell><Data ss:Type="String"></Data></Cell>
+									<Cell><Data ss:Type="String"></Data></Cell>
+									<Cell><Data ss:Type="String"></Data></Cell>
+									<Cell><Data ss:Type="String"><xsl:value-of select="@proprietaire_nom" /></Data></Cell>
+									<Cell><Data ss:Type="String"><xsl:value-of select="@proprietaire_adresse" /></Data></Cell>
+								</Row>
+							</xsl:if>
+						</xsl:for-each>
+					</xsl:for-each> 
+
+					<Row ss:AutoFitHeight="0">
+						<Cell><Data ss:Type="String">TOTAUX</Data></Cell>
+						<Cell><Data ss:Type="String"></Data></Cell>
+						<Cell><Data ss:Type="Number"><xsl:value-of select="./Mj_Compte_Communal_Parcelles/@Sum_contenance_m2" /></Data></Cell>
+						<Cell><Data ss:Type="String"></Data></Cell>
+						<Cell><Data ss:Type="String"></Data></Cell>
+						<Cell><Data ss:Type="String"></Data></Cell>
+					</Row>
+
+			</Table>
+			<WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">
+				<PageSetup>
+					<Header x:Margin="0.3"/>
+					<Footer x:Margin="0.3"/>
+					<PageMargins x:Bottom="0.75" x:Left="0.7" x:Right="0.7" x:Top="0.75"/>
+				</PageSetup>
+				<Unsynced/>
+				<Print>
+					<ValidPrinterInfo/>
+					<PaperSizeIndex>9</PaperSizeIndex>
+					<HorizontalResolution>600</HorizontalResolution>
+					<VerticalResolution>600</VerticalResolution>
+				</Print>
+				<Selected/>
+				<ProtectObjects>False</ProtectObjects>
+				<ProtectScenarios>False</ProtectScenarios>
+			</WorksheetOptions>
+		 </Worksheet>
+	</Workbook>
+</xsl:template>
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/src/module_cadastre/web_service/class/majic_lib/xsl/Mj_Rapport_Parcelle_ProprietaireLocaux.xsl b/src/module_cadastre/web_service/class/majic_lib/xsl/Mj_Rapport_Parcelle_ProprietaireLocaux.xsl
new file mode 100755
index 0000000000000000000000000000000000000000..8a9cfff6b14d15c3029a4bab4a6c01ecc7c3f3ef
--- /dev/null
+++ b/src/module_cadastre/web_service/class/majic_lib/xsl/Mj_Rapport_Parcelle_ProprietaireLocaux.xsl
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding='utf-8' ?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:output method="xml" indent="yes"/>
+<xsl:template match="Rapport_Parcelle">
+<?mso-application progid="Excel.Sheet"?>
+	<Workbook xmlns="urn:schemas-microsoft-com:office:spreadsheet"
+		xmlns:o="urn:schemas-microsoft-com:office:office"
+		xmlns:x="urn:schemas-microsoft-com:office:excel"
+		xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet"
+		xmlns:html="http://www.w3.org/TR/REC-html40">
+		<DocumentProperties xmlns="urn:schemas-microsoft-com:office:office">
+			<Author>Veremap.pro</Author>
+			<LastAuthor>Veremap.pro</LastAuthor>
+			<Company>Veremes</Company>
+		</DocumentProperties>
+		<ExcelWorkbook xmlns="urn:schemas-microsoft-com:office:excel">
+			<WindowHeight>12300</WindowHeight>
+			<WindowWidth>18915</WindowWidth>
+			<WindowTopX>120</WindowTopX>
+			<WindowTopY>105</WindowTopY>
+			<ProtectStructure>False</ProtectStructure>
+			<ProtectWindows>False</ProtectWindows>
+		</ExcelWorkbook>
+		<Styles>
+			<Style ss:ID="Default" ss:Name="Normal">
+				<Alignment ss:Vertical="Bottom"/>
+				<Borders/>
+				<Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="11" ss:Color="#000000"/>
+				<Interior/>
+				<NumberFormat/>
+				<Protection/>
+			</Style>
+			<Style	ss:ID="s64">
+				<Alignment	ss:Horizontal="Center"	ss:Vertical="Top"/>
+				<Borders>
+					<Border	ss:Position="Bottom"	ss:LineStyle="Continuous"	ss:Weight="2"/>
+					<Border	ss:Position="Left"	ss:LineStyle="Continuous"	ss:Weight="2"/>
+					<Border	ss:Position="Right"	ss:LineStyle="Continuous"	ss:Weight="2"/>
+					<Border	ss:Position="Top"	ss:LineStyle="Continuous"	ss:Weight="2"/>
+				</Borders>
+			</Style>
+			<Style ss:ID="s65">
+				<Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
+			</Style>
+		</Styles>
+
+		<Worksheet ss:Name="Feuil1">
+			<!--<xsl:variable name="nb_ligne"><xsl:value-of select="./XmlMapLog/XmlLog/@nb_ligne" /></xsl:variable>-->
+			<Table ss:ExpandedColumnCount="30" x:FullColumns="1" x:FullRows="1" ss:DefaultColumnWidth="60" ss:DefaultRowHeight="15">
+				<!--<xsl:attribute name="ss:ExpandedRowCount"><xsl:value-of select="1000" /></xsl:attribute>-->
+				<Column ss:AutoFitWidth="0" ss:Width="100"/>
+				<Column ss:AutoFitWidth="0" ss:Width="100"/>
+				<Column ss:AutoFitWidth="0" ss:Width="200"/>
+				<Column ss:AutoFitWidth="0" ss:Width="55"/>
+				<Column ss:AutoFitWidth="0" ss:Width="60"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="90"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="45"/>
+				<Column ss:AutoFitWidth="0" ss:Width="200"/>
+				<Column ss:AutoFitWidth="0" ss:Width="80"/>
+				<Column ss:AutoFitWidth="0" ss:Width="115"/>
+				<Column ss:AutoFitWidth="0" ss:Width="200"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="80"/>
+				<Row ss:AutoFitHeight="0" ss:Height="15.75" ss:StyleID="s64">
+					<Cell ss:MergeAcross="3"><Data ss:Type="String">PARCELLES</Data></Cell>
+					<Cell ss:MergeAcross="12"><Data ss:Type="String">LOCAUX</Data></Cell>
+				</Row>
+
+				<Row ss:AutoFitHeight="0" ss:Height="30" ss:StyleID="s65">
+					<Cell><Data ss:Type="String">Parcelle</Data></Cell>
+					<Cell><Data ss:Type="String">Commune</Data></Cell>
+					<Cell><Data ss:Type="String">Adresse parcelle</Data></Cell>
+					<Cell><Data ss:Type="String">Superficie parcelle(m²)</Data></Cell>
+					<Cell><Data ss:Type="String">Invariant</Data></Cell>
+					<Cell><Data ss:Type="String">Superficie local(m²)</Data></Cell>
+					<Cell><Data ss:Type="String">Type</Data></Cell>
+					<Cell><Data ss:Type="String">Nature</Data></Cell>
+					<Cell><Data ss:Type="String">Occupation</Data></Cell>
+					<Cell><Data ss:Type="String">Année construction</Data></Cell>
+					<Cell><Data ss:Type="String">Étage</Data></Cell>
+					<Cell><Data ss:Type="String">Adresse local</Data></Cell>
+					<Cell><Data ss:Type="String">Compte propriétaire</Data></Cell>
+					<Cell><Data ss:Type="String">Propriétaire</Data></Cell>
+					<Cell><Data ss:Type="String">Adresse propriétaire</Data></Cell>
+					<Cell><Data ss:Type="String">Indivision</Data></Cell>
+					<Cell><Data ss:Type="String">Droit</Data></Cell>
+				</Row>
+
+				<xsl:for-each select="Mj_Bati_Parcelles/Mj_Bati_Parcelle">
+					<Row ss:AutoFitHeight="0">
+						<Cell><Data ss:Type="String"><xsl:value-of select="@id_par" /></Data></Cell>
+						<Cell><Data ss:Type="String"><xsl:value-of select="@com" /></Data></Cell>
+						<Cell><Data ss:Type="String"><xsl:value-of select="@adresse" /></Data></Cell>
+						<Cell><Data ss:Type="Number"><xsl:value-of select="@contenance" /></Data></Cell>
+						<xsl:if test="./Mj_Bati/@bat != '' ">
+							<Cell><Data ss:Type="String"><xsl:value-of select="./Mj_Bati/@num_invar" /></Data></Cell>
+							<Cell><Data ss:Type="Number"><xsl:value-of select="./Mj_Bati/Mj_Pev/Mj_Habit_Descr/@suf_piece_total" /></Data></Cell>
+							<Cell><Data ss:Type="String"><xsl:value-of select="./Mj_Bati/@local_type" /></Data></Cell>
+							<Cell><Data ss:Type="String"><xsl:value-of select="./Mj_Bati/@lib_nature" /></Data></Cell>
+							<Cell><Data ss:Type="String"><xsl:value-of select="./Mj_Bati/@lib_occupation" /></Data></Cell>
+							<Cell><Data ss:Type="String"><xsl:value-of select="./Mj_Bati/@annee_constr" /></Data></Cell>
+							<Cell><Data ss:Type="String"><xsl:value-of select="./Mj_Bati/@niv" /></Data></Cell>
+							<Cell><Data ss:Type="String">Batiment <xsl:value-of select="./Mj_Bati/@bat" /> <xsl:value-of select="./Mj_Bati/@ent" />, Etage <xsl:value-of select="./Mj_Bati/@niv" />, Porte  <xsl:value-of select="./Mj_Bati/@num_de_porte" />,, <xsl:value-of select="./Mj_Bati/@adresse" /></Data></Cell>
+						</xsl:if>
+						<xsl:if test="./Mj_Bati/@bat = '' ">
+							<Cell><Data ss:Type="String"></Data></Cell>
+							<Cell><Data ss:Type="String"></Data></Cell>
+							<Cell><Data ss:Type="String"></Data></Cell>
+							<Cell><Data ss:Type="String"></Data></Cell>
+							<Cell><Data ss:Type="String"></Data></Cell>
+							<Cell><Data ss:Type="String"></Data></Cell>
+							<Cell><Data ss:Type="String"></Data></Cell>
+							<Cell><Data ss:Type="String"></Data></Cell>
+						</xsl:if>
+						<Cell><Data ss:Type="String"><xsl:value-of select="./Mj_Bati/Mj_Proprietaire/@dnupro" /></Data></Cell>
+						<Cell><Data ss:Type="String"><xsl:value-of select="./Mj_Bati/Mj_Proprietaire/@proprietaire_nom" /></Data></Cell>
+						<Cell><Data ss:Type="String"><xsl:value-of select="./Mj_Bati/Mj_Proprietaire/@proprietaire_adresse" /></Data></Cell>
+						<Cell><Data ss:Type="String"><xsl:value-of select="./Mj_Bati/Mj_Proprietaire/@l_ccodem" /></Data></Cell>
+						<Cell><Data ss:Type="String"><xsl:value-of select="./Mj_Bati/Mj_Proprietaire/@l_ccodro" /></Data></Cell>
+					</Row>
+
+					<xsl:for-each select="./Mj_Bati/Mj_Proprietaire">
+						<xsl:if test="position()!=1">
+							<Row ss:AutoFitHeight="0">
+								<Cell><Data ss:Type="String"></Data></Cell>
+								<Cell><Data ss:Type="String"></Data></Cell>
+								<Cell><Data ss:Type="String"></Data></Cell>
+								<Cell><Data ss:Type="String"></Data></Cell>
+								<Cell><Data ss:Type="String"><xsl:value-of select="../@num_invar" /></Data></Cell>
+								<Cell><Data ss:Type="Number"><xsl:value-of select="../Mj_Pev/Mj_Habit_Descr/@suf_piece_total" /></Data></Cell>
+								<Cell><Data ss:Type="String"><xsl:value-of select="../@local_type" /></Data></Cell>
+								<Cell><Data ss:Type="String"><xsl:value-of select="../@lib_nature" /></Data></Cell>
+								<Cell><Data ss:Type="String"><xsl:value-of select="../@lib_occupation" /></Data></Cell>
+								<Cell><Data ss:Type="String"><xsl:value-of select="../@annee_constr" /></Data></Cell>
+								<Cell><Data ss:Type="String"><xsl:value-of select="../@niv" /></Data></Cell>
+								<Cell><Data ss:Type="String">Batiment <xsl:value-of select="../@bat" /> <xsl:value-of select="../@ent" />, Etage <xsl:value-of select="../@niv" />, Porte  <xsl:value-of select="../@num_de_porte" />,, <xsl:value-of select="../@adresse" /></Data></Cell>
+								<Cell><Data ss:Type="String"><xsl:value-of select="./@dnupro" /></Data></Cell>
+								<Cell><Data ss:Type="String"><xsl:value-of select="./@proprietaire_nom" /></Data></Cell>
+								<Cell><Data ss:Type="String"><xsl:value-of select="./@proprietaire_adresse" /></Data></Cell>
+								<Cell><Data ss:Type="String"><xsl:value-of select="./@l_ccodem" /></Data></Cell>
+								<Cell><Data ss:Type="String"><xsl:value-of select="./@l_ccodro" /></Data></Cell>
+							</Row>
+						</xsl:if>
+					</xsl:for-each>
+				</xsl:for-each>
+
+				<Row ss:AutoFitHeight="0">
+					<Cell><Data ss:Type="String">TOTAUX</Data></Cell>
+					<Cell><Data ss:Type="String"></Data></Cell>
+					<Cell><Data ss:Type="String"></Data></Cell>
+					<Cell><Data ss:Type="Number"><xsl:value-of select="./Mj_Bati_Parcelles/@sum_contenance_m2" /></Data></Cell>
+				</Row>
+
+			</Table>
+			<WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">
+				<PageSetup>
+					<Header x:Margin="0.3"/>
+					<Footer x:Margin="0.3"/>
+					<PageMargins x:Bottom="0.75" x:Left="0.7" x:Right="0.7" x:Top="0.75"/>
+				</PageSetup>
+				<Unsynced/>
+				<Print>
+					<ValidPrinterInfo/>
+					<PaperSizeIndex>9</PaperSizeIndex>
+					<HorizontalResolution>600</HorizontalResolution>
+					<VerticalResolution>600</VerticalResolution>
+				</Print>
+				<Selected/>
+				<ProtectObjects>False</ProtectObjects>
+				<ProtectScenarios>False</ProtectScenarios>
+			</WorksheetOptions>
+		 </Worksheet>
+	</Workbook>
+</xsl:template>
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/src/module_cadastre/web_service/class/majic_lib/xsl/Mj_Rapport_Parcelle_SubdivisionFiscale.xsl b/src/module_cadastre/web_service/class/majic_lib/xsl/Mj_Rapport_Parcelle_SubdivisionFiscale.xsl
new file mode 100755
index 0000000000000000000000000000000000000000..bd1e45b07c4f9eb4b7c979b8e63b0ec748f80b54
--- /dev/null
+++ b/src/module_cadastre/web_service/class/majic_lib/xsl/Mj_Rapport_Parcelle_SubdivisionFiscale.xsl
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding='utf-8' ?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:output method="xml" indent="yes"/>
+<xsl:template match="Rapport_Parcelle">
+<?mso-application progid="Excel.Sheet"?>
+	<Workbook xmlns="urn:schemas-microsoft-com:office:spreadsheet"
+		xmlns:o="urn:schemas-microsoft-com:office:office"
+		xmlns:x="urn:schemas-microsoft-com:office:excel"
+		xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet"
+		xmlns:html="http://www.w3.org/TR/REC-html40">
+		<DocumentProperties xmlns="urn:schemas-microsoft-com:office:office">
+			<Author>Veremap.pro</Author>
+			<LastAuthor>Veremap.pro</LastAuthor>
+			<Company>Veremes</Company>
+		</DocumentProperties>
+		<ExcelWorkbook xmlns="urn:schemas-microsoft-com:office:excel">
+			<WindowHeight>12300</WindowHeight>
+			<WindowWidth>18915</WindowWidth>
+			<WindowTopX>120</WindowTopX>
+			<WindowTopY>105</WindowTopY>
+			<ProtectStructure>False</ProtectStructure>
+			<ProtectWindows>False</ProtectWindows>
+		</ExcelWorkbook>
+		<Styles>
+			<Style ss:ID="Default" ss:Name="Normal">
+				<Alignment ss:Vertical="Bottom"/>
+				<Borders/>
+				<Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="11" ss:Color="#000000"/>
+				<Interior/>
+				<NumberFormat/>
+				<Protection/>
+			</Style>
+
+			<Style	ss:ID="s63">
+				<Alignment	ss:Horizontal="Center"	ss:Vertical="Bottom"/>
+				<Borders>
+					<Border	ss:Position="Bottom"	ss:LineStyle="Continuous"	ss:Weight="2"/>
+					<Border	ss:Position="Left"	ss:LineStyle="Continuous"	ss:Weight="2"/>
+					<Border	ss:Position="Top"	ss:LineStyle="Continuous"	ss:Weight="2"/>
+				</Borders>
+			</Style>
+			<Style	ss:ID="s64">
+				<Alignment	ss:Horizontal="Center"	ss:Vertical="Bottom"/>
+				<Borders>
+					<Border	ss:Position="Bottom"	ss:LineStyle="Continuous"	ss:Weight="2"/>
+					<Border	ss:Position="Left"	ss:LineStyle="Continuous"	ss:Weight="2"/>
+					<Border	ss:Position="Right"	ss:LineStyle="Continuous"	ss:Weight="2"/>
+					<Border	ss:Position="Top"	ss:LineStyle="Continuous"	ss:Weight="2"/>
+				</Borders>
+			</Style>
+			<Style	ss:ID="s65">
+				<Alignment	ss:Horizontal="Center"	ss:Vertical="Bottom"/>
+			</Style>
+
+		</Styles>
+		 <Worksheet ss:Name="Feuil1">
+			<Table ss:ExpandedColumnCount="6" x:FullColumns="1" x:FullRows="1" ss:DefaultColumnWidth="60" ss:DefaultRowHeight="15">
+				<Column ss:AutoFitWidth="0" ss:Width="103.5"/>
+				<Column ss:AutoFitWidth="0" ss:Width="105"/>
+				<Column ss:AutoFitWidth="0" ss:Width="115"/>
+				<Column ss:AutoFitWidth="0" ss:Width="115"/>
+				<Column ss:AutoFitWidth="0" ss:Width="110"/>
+				<Column ss:AutoFitWidth="0" ss:Width="110"/>
+
+				<Row	ss:AutoFitHeight="0"	ss:Height="15.75">
+					<Cell	ss:MergeAcross="2"	ss:StyleID="s63"><Data ss:Type="String">PARCELLES</Data></Cell>
+					<Cell	ss:MergeAcross="2"	ss:StyleID="s64"><Data ss:Type="String">SUBDIVISION FISCALE</Data></Cell>
+				</Row>
+				<Row ss:AutoFitHeight="0">
+					<Cell	ss:StyleID="s65"><Data ss:Type="String">Parcelle</Data></Cell>
+					<Cell	ss:StyleID="s65"><Data ss:Type="String">Adresse</Data></Cell> 
+					<Cell	ss:StyleID="s65"><Data ss:Type="String">Surface cadastrale (m²)</Data></Cell>
+					<Cell	ss:StyleID="s65"><Data ss:Type="String">Revenu (Euros)</Data></Cell>
+					<Cell	ss:StyleID="s65"><Data ss:Type="String">Surface (m²)</Data></Cell>
+					<Cell	ss:StyleID="s65"><Data ss:Type="String">Occupation</Data></Cell>
+				</Row>
+				<xsl:for-each select="./Mj_Compte_Communal_Parcelles/Mj_Compte_Communal_Parcelle">
+
+					<Row ss:AutoFitHeight="0"> 
+						<Cell><Data ss:Type="String"><xsl:value-of select="./Mj_Parcelle/@idpar" /></Data></Cell>
+						<Cell><Data ss:Type="String"><xsl:value-of select="./Mj_Parcelle/@adresse" /></Data></Cell>
+						<Cell><Data ss:Type="Number"><xsl:value-of select="./Mj_Parcelle/@contenance" /></Data></Cell>
+						<Cell><Data ss:Type="Number"><xsl:value-of select="./@total_revenu_cadastral" /></Data></Cell>
+						<Cell><Data ss:Type="Number"><xsl:value-of select="./@total_contenance" /></Data></Cell>
+						<Cell><Data ss:Type="String"><xsl:value-of select="./Mj_Parcelle/Mj_Suf/@occupation" /></Data></Cell>
+					</Row>
+				</xsl:for-each>
+
+				<Row ss:AutoFitHeight="0">
+					<Cell><Data ss:Type="String">TOTAUX</Data></Cell>
+					<Cell><Data ss:Type="String"></Data></Cell>
+					<Cell><Data ss:Type="Number"><xsl:value-of select="./Mj_Compte_Communal_Parcelles/@Sum_contenance_m2" /></Data></Cell>
+					<Cell><Data ss:Type="Number"><xsl:value-of select="./Mj_Compte_Communal_Parcelles/@Sum_revenu" /></Data></Cell>
+					<Cell><Data ss:Type="Number"><xsl:value-of select="./Mj_Compte_Communal_Parcelles/@Sum_contenance_m2" /></Data></Cell>
+					<Cell><Data ss:Type="String"></Data></Cell>
+				</Row>
+
+			</Table>
+			<WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">
+				<PageSetup>
+					<Header x:Margin="0.3"/>
+					<Footer x:Margin="0.3"/>
+					<PageMargins x:Bottom="0.75" x:Left="0.7" x:Right="0.7" x:Top="0.75"/>
+				</PageSetup>
+				<Unsynced/>
+				<Print>
+					<ValidPrinterInfo/>
+					<PaperSizeIndex>9</PaperSizeIndex>
+					<HorizontalResolution>600</HorizontalResolution>
+					<VerticalResolution>600</VerticalResolution>
+				</Print>
+				<Selected/>
+				<ProtectObjects>False</ProtectObjects>
+				<ProtectScenarios>False</ProtectScenarios>
+			</WorksheetOptions>
+		 </Worksheet>
+	</Workbook>
+</xsl:template>
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/src/module_cadastre/web_service/class/majic_lib/xsl/Mj_fo.xsl b/src/module_cadastre/web_service/class/majic_lib/xsl/Mj_fo.xsl
new file mode 100755
index 0000000000000000000000000000000000000000..dbfa9df57303c23247d4de3a7a75ecabf4449384
--- /dev/null
+++ b/src/module_cadastre/web_service/class/majic_lib/xsl/Mj_fo.xsl
@@ -0,0 +1,2405 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+   <xsl:template match="/">
+      <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+         <fo:layout-master-set>
+            <fo:simple-page-master master-name="simple" page-height="21cm" page-width="29.7cm" margin-top="0.5cm" margin-bottom="0.5cm" margin-left="0.5cm" margin-right="0.5cm">
+               <fo:region-body margin="0.5cm 0 0.5cm 0" />
+            </fo:simple-page-master>
+         </fo:layout-master-set>
+
+         <fo:page-sequence master-reference="simple" font-family="Times">
+<!-- Tableau global bas� sur la structure de la premi�re ligne du relev� de propri�t� -->
+            <fo:flow flow-name="xsl-region-body">
+               <fo:table table-layout="fixed" width="100%" border-collapse="collapse" font-size="7pt">
+                  <fo:table-column column-width="28.7" />
+
+<!-- D�but de l'en-t�te qui se retrouvera sur chaque page du RP -->
+                  <fo:table-header>
+				  <fo:table-row>
+                  <fo:table-cell>
+                  <fo:table table-layout="fixed" width="100%" border-collapse="collapse" font-size="7pt">
+				  <fo:table-column column-width="1.2cm" />
+                  <fo:table-column column-width="0.6cm" />
+                  <fo:table-column column-width="0.6cm" />
+                  <fo:table-column column-width="0.9cm" />
+                  <fo:table-column column-width="0.9cm" />
+                  <fo:table-column column-width="6.4cm" />
+                  <fo:table-column column-width="15.4cm" />
+                  <fo:table-column column-width="1.8cm" />
+                  <fo:table-column column-width="0.9cm" />
+				  <fo:table-body>
+                     <xsl:for-each select="Mj/Mj_Compte_Communal | Mj/Mj_Compte_Communal_Parcelle">
+                        <fo:table-row>
+                           <fo:table-cell border="0.5pt solid black">
+                              <fo:block text-align="center" line-height="0.25cm" vertical-align="middle">ANNEE DE MAJ</fo:block>
+                           </fo:table-cell>
+
+                           <fo:table-cell border="0.5pt solid black">
+                              <fo:block text-align="center" line-height="0.5cm" vertical-align="middle">
+                                 <xsl:value-of select="@annee_de_maj" />
+                              </fo:block>
+                           </fo:table-cell>
+
+                           <fo:table-cell border="0.5pt solid black">
+                              <fo:block text-align="center" line-height="0.25cm" vertical-align="middle">DEP DIR</fo:block>
+                           </fo:table-cell>
+
+                           <fo:table-cell border="0.5pt solid black">
+                              <fo:block text-align="center" line-height="0.5cm" vertical-align="middle">
+                                 <xsl:value-of select="@dep_dir" />
+                              </fo:block>
+                           </fo:table-cell>
+
+                           <fo:table-cell border="0.5pt solid black">
+                              <fo:block text-align="center" line-height="0.5cm" vertical-align="middle">COM</fo:block>
+                           </fo:table-cell>
+
+                           <fo:table-cell border-color="black" border-style="solid" padding-left="0.1cm" border-width="0.5pt">
+                              <fo:block line-height="0.5cm" vertical-align="middle">
+                                 <xsl:value-of select="@com" />
+                              </fo:block>
+                           </fo:table-cell>
+
+                           <fo:table-cell>
+                              <fo:block text-align="center" line-height="0.5cm" vertical-align="middle" font-size="16pt" font-style="italic">RELEVE DE PROPRIETE ( 
+                              <fo:page-number />
+
+                              / 
+                              <fo:page-number-citation ref-id="theEnd" />
+
+                              )</fo:block>
+                           </fo:table-cell>
+
+                           <fo:table-cell border="0.5pt solid black">
+                              <fo:block text-align="center" line-height="0.25cm" vertical-align="middle">NUMERO COMMUNAL</fo:block>
+                           </fo:table-cell>
+
+                           <fo:table-cell border-color="black" border-style="solid" border-width="0.5pt">
+                              <fo:block text-align="center" line-height="0.5cm" vertical-align="middle">
+                                 <xsl:value-of select="@numero_communal" />
+                              </fo:block>
+                           </fo:table-cell>
+                        </fo:table-row>
+                     </xsl:for-each>
+					 </fo:table-body>
+					 </fo:table>
+					 </fo:table-cell>
+                     </fo:table-row>
+
+<!-- Affichage de la ligne titre "PROPRIETAIRE" -->
+                     <fo:table-row>
+                        <fo:table-cell>
+                           <fo:table table-layout="fixed" width="100%" border-collapse="collapse" font-size="7pt">
+                              <fo:table-column column-width="28.7cm" />
+
+                              <fo:table-body>
+                                 <fo:table-row>
+                                    <fo:table-cell padding-top="0.5cm" padding-bottom="0.1cm">
+                                       <fo:block font-size="8pt" text-align="center">PROPRIETAIRE</fo:block>
+                                    </fo:table-cell>
+                                 </fo:table-row>
+                              </fo:table-body>
+                           </fo:table>
+                        </fo:table-cell>
+                     </fo:table-row>
+
+<!-- Affichage du tableau proprietaire -->
+                     <fo:table-row>
+                        <fo:table-cell>
+                           <fo:table table-layout="fixed" border="0.5pt solid black" width="100%" font-size="8pt" >
+                              <fo:table-column column-width="21.7cm" />
+
+                              <fo:table-column column-width="7cm" />
+
+                              <fo:table-body>
+                                 <xsl:for-each select="Mj/Mj_Compte_Communal/Mj_Proprietaire | Mj/Mj_Compte_Communal_Parcelle/Mj_Proprietaire">
+                                    <fo:table-row>
+                                       <fo:table-cell>
+                                          <fo:block>
+                                          <!-- <xsl:value-of select="@l_ccodro" /> -->
+
+                                          � 
+                                          <!-- <xsl:value-of select="@l_ccodem" /> -->
+
+                                          � 
+                                          <xsl:value-of select="@dnuper" />
+
+                                          � 
+                                          <xsl:value-of select="@proprietaire_nom" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell padding-left="0.3cm">
+                                          <fo:block>
+                                             <xsl:value-of select="@jdatnss" />
+                                          </fo:block>
+                                       </fo:table-cell>
+                                    </fo:table-row>
+
+                                    <fo:table-row>
+                                       <fo:table-cell padding-left="0.3cm">
+                                          <fo:block>
+                                             <xsl:value-of select="@proprietaire_adresse" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell>
+                                          <fo:block>
+                                             <xsl:value-of select="@dldnss" />
+                                          </fo:block>
+                                       </fo:table-cell>
+                                    </fo:table-row>
+                                 </xsl:for-each>
+                              </fo:table-body>
+                           </fo:table>
+                        </fo:table-cell>
+                     </fo:table-row>
+                  </fo:table-header>
+
+<!-- Fin de l'en-t�te -->
+<!-- D�but du corps du tableau global -->
+                  <fo:table-body>
+<!-- Affichage des poprietes baties -->
+                     <fo:table-row>
+                        <fo:table-cell>
+                           <fo:table table-layout="fixed" width="100%" border-collapse="collapse" font-size="7pt">
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="1.2cm" />
+
+                              <fo:table-column column-width="1cm" />
+
+                              <fo:table-column column-width="0.4cm" />
+
+                              <fo:table-column column-width="1.2cm" />
+
+                              <fo:table-column column-width="6.4cm" />
+
+                              <fo:table-column column-width="0.9cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="1.2cm" />
+
+                              <fo:table-column column-width="1.8cm" />
+
+                              <fo:table-column column-width="0.7cm" />
+
+                              <fo:table-column column-width="0.7cm" />
+
+                              <fo:table-column column-width="0.4cm" />
+
+                              <fo:table-column column-width="1.2cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="2.4cm" />
+
+                              <fo:table-column column-width="0.7cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="1.8cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="0.7cm" />
+
+<!-- Affichage de l'en-t�te des propri�t�s baties -->
+                              <fo:table-header>
+                                 <fo:table-row>
+                                    <fo:table-cell number-columns-spanned="26" padding-top="1cm" padding-bottom="0.1cm">
+                                       <fo:block text-align="center" font-size="8pt" line-height="0.5cm" vertical-align="middle">PROPRIETES BATIES</fo:block>
+                                    </fo:table-cell>
+                                 </fo:table-row>
+
+                                 <fo:table-row>
+                                    <fo:table-cell number-columns-spanned="7" border="0.5pt solid black">
+                                       <fo:block text-align="center" font-size="8pt" line-height="0.5cm" vertical-align="middle">DESIGNATION DES PROPRIETES</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell number-columns-spanned="5" border="0.5pt solid black" border-left="hidden">
+                                       <fo:block text-align="center" font-size="8pt" line-height="0.5cm" vertical-align="middle">IDENTIFICATION DU LOCAL</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell number-columns-spanned="14" border="0.5pt solid black" border-left="hidden">
+                                       <fo:block text-align="center" font-size="8pt" line-height="0.5cm" vertical-align="middle">EVALUATION DU LOCAL</fo:block>
+                                    </fo:table-cell>
+                                 </fo:table-row>
+
+<!-- Affichage des titres des colonnes des propri�t�s baties -->
+                                 <fo:table-row>
+                                    <fo:table-cell border="0.5pt solid black" >
+                                      <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">AN</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black" >
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">SECTION</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black" >
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">N�PLAN</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black" >
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">CP</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black" >
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">N� Voirie</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black" >
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">ADRESSE</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black"  border-left="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">CODE RIVOLI</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black" >
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">BAT</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black" >
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">ENT</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black" >
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">NIV</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black" >
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">N�PORTE</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black" >
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">N�INVAR</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black" >
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">S TAR</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black" >
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">M EVAL</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black" >
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">AF</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black" >
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">NAT LOC</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black" >
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">CAT</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black" >
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">REVENU CADASTRAL</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black" >
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">COLL</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black" >
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">NAT EXO</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black" >
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">AN RET</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black" >
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">AN DEB</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black" >
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">FRACTION RC EXO</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black" >
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">% EXO</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black" >
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">TX OM</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">COEF</fo:block>
+                                    </fo:table-cell>
+                                 </fo:table-row>
+                              </fo:table-header>
+
+                              <fo:table-footer>
+                                 <fo:table-row>
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+                                 </fo:table-row>
+                              </fo:table-footer>
+
+<!-- Affichage des donn�es des propri�t�s baties -->
+                              <fo:table-body>
+                                 <fo:table-row>
+                                    <fo:table-cell>
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+                                 </fo:table-row>
+
+                                 <xsl:for-each select="Mj/Mj_Compte_Communal/Mj_Bati | Mj/Mj_Compte_Communal_Parcelle/Mj_Bati">
+								 <xsl:sort select="@section" />
+									<xsl:sort select="@num_plan" data-type="number"/>
+                                    <fo:table-row>
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@date" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell padding-right="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="right" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@section" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@num_plan" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@cp" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@voirie" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell padding-left="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@adresse" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-left="hidden" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@code_rivoli" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@bat" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@ent" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@niv" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@num_de_porte" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell padding-left="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@num_invar" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+<!--Affichage du PEV lorsqu'il n'y en a qu'un (m�me ligne) -->
+                                       <xsl:if test="count(Mj_Pev) = 1">
+                                          <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="@s_tar" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="@m_eva" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="@af" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="@nat_loc" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="@cat" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell padding-right="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="right" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="@revenu_cadastral" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="Mj_Pev/Mj_Exone_Pev/@coll" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell padding-right="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="Mj_Pev/@nat_exo" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="Mj_Pev/Mj_Exone_Pev/@an_ret" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="right" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="Mj_Pev/Mj_Exone_Pev/@fraction_rc_exo" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="Mj_Pev/Mj_Exone_Pev/@pourc_exo" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="@tx_om" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             </fo:block>
+                                          </fo:table-cell>
+                                       </xsl:if>
+
+<!--Affichage du premier PEV lorsqu'il y en a plusieurs (m�me ligne) -->
+                                       <xsl:if test="count(Mj_Pev) &gt; 1">
+                                          <xsl:for-each select="Mj_Pev">
+                                             <xsl:if test="position()=1">
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                      <xsl:value-of select="@s_tar" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                      <xsl:value-of select="../@m_eva" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                      <xsl:value-of select="@af" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                      <xsl:value-of select="../@nat_loc" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                      <xsl:value-of select="@cat" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell padding-right="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="right" vertical-align="middle" line-height="0.5cm">
+                                                      <xsl:value-of select="@revenu_cadastral" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                      <xsl:value-of select="@nat_exo" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+                                             </xsl:if>
+                                          </xsl:for-each>
+                                       </xsl:if>
+                                    </fo:table-row>
+
+<!--Affichage des PEV suivants (lignes suivantes) -->
+                                    <xsl:if test="count(Mj_Pev) &gt; 1">
+                                       <xsl:for-each select="Mj_Pev">
+                                          <xsl:if test="position()&gt;1">
+                                             <fo:table-row>
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                      <xsl:value-of select="@s_tar" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                      <xsl:value-of select="../@m_eva" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                      <xsl:value-of select="@af" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                      <xsl:value-of select="../@nat_loc" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                      <xsl:value-of select="@cat" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell padding-right="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="right" vertical-align="middle" line-height="0.25cm">
+                                                      <xsl:value-of select="@revenu_cadastral" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                      <xsl:value-of select="@nat_exo" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+                                             </fo:table-row>
+
+                                             <fo:table-row>
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell padding-right="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="right" vertical-align="middle" line-height="0.25cm">
+                                                      <xsl:value-of select="../@revenu_cadastral" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                      <xsl:value-of select="../@tx_om" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+                                             </fo:table-row>
+                                          </xsl:if>
+                                       </xsl:for-each>
+                                    </xsl:if>
+
+<!--Affichage des Lot_Local s'il y en a -->
+                                    <xsl:if test="count(Mj_Lot_Local) &gt; 0">
+                                       <xsl:for-each select="Mj_Lot_Local">
+                                          <fo:table-row>
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell padding-left="0.4cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block vertical-align="middle" line-height="0.25cm">
+                                                   <xsl:value-of select="@lot" />
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell padding-right="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="right" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+                                          </fo:table-row>
+                                       </xsl:for-each>
+                                    </xsl:if>
+                                 </xsl:for-each>
+                              </fo:table-body>
+                           </fo:table>
+                        </fo:table-cell>
+                     </fo:table-row>
+
+<!-- Affichage du pied du tableau des proprietes baties -->
+                     <fo:table-row>
+                        <fo:table-cell>
+                           <fo:block keep-together="always" keep-with-previous="always">
+                              <fo:table table-layout="fixed" border-collapse="collapse" width="28.7cm" border-color="black" border-right="0.5pt" border-left="0.5pt" border-top="0pt" border-bottom="0.5pt" border-style="solid" font-size="6pt" padding-top="0.2cm" padding-bottom="0.1cm">
+                                 <fo:table-column column-width="1.8cm" />
+
+                                 <fo:table-column column-width="2cm" />
+
+                                 <fo:table-column column-width="2.5cm" />
+
+                                 <fo:table-column column-width="1.5cm" />
+
+                                 <fo:table-column column-width="2cm" />
+
+                                 <fo:table-column column-width="2.5cm" />
+
+                                 <fo:table-column column-width="1.5cm" />
+
+                                 <fo:table-column column-width="2cm" />
+
+                                 <fo:table-column column-width="2.5cm" />
+
+                                 <fo:table-column column-width="1.5cm" />
+
+                                 <fo:table-column column-width="2cm" />
+
+                                 <fo:table-column column-width="6.9cm" />
+
+                                 <fo:table-body>
+                                    <xsl:for-each select="Mj/Mj_Compte_Communal | Mj/Mj_Compte_Communal_Parcelle">
+                                       <fo:table-row>
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell >
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">R EXO</fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">
+                                             <xsl:value-of select="@exo_com_bati_float" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell >
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">R EXO</fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">
+                                             <xsl:value-of select="@exo_dep_bati_float" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell >
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">R EXO</fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">
+                                             <xsl:value-of select="@exo_reg_bati_float" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+                                       </fo:table-row>
+
+                                       <fo:table-row>
+                                          <fo:table-cell>
+                                             <fo:block text-align="left" line-height="0.60cm" vertical-align="middle">REV IMPOSABLE</fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.60cm" vertical-align="middle">
+                                             <xsl:value-of select="@rev_impo_bati_float" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.60cm" vertical-align="middle">COM</fo:block>
+                                          </fo:table-cell>
+
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell >
+                                             <fo:block text-align="right" line-height="0.60cm" vertical-align="middle">DEP</fo:block>
+                                          </fo:table-cell>
+
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.60cm" vertical-align="middle">R</fo:block>
+                                          </fo:table-cell>
+
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+                                       </fo:table-row>
+
+                                       <fo:table-row>
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell >
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle">R IMP</fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle">
+                                             <xsl:value-of select="@rev_impo_com_bati_float" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell >
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle">R IMP</fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle">
+                                             <xsl:value-of select="@rev_impo_dep_bati_float" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell >
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle">R IMP</fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle">
+                                             <xsl:value-of select="@rev_impo_reg_bati_float" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+                                       </fo:table-row>
+                                    </xsl:for-each>
+                                 </fo:table-body>
+                              </fo:table>
+                           </fo:block>
+                        </fo:table-cell>
+                     </fo:table-row>
+
+<!-- Affichage des proprietes non baties -->
+                     <fo:table-row>
+                        <fo:table-cell>
+                           <fo:table table-layout="fixed" width="100%" border-collapse="collapse" font-size="7pt">
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="1.5cm" />
+
+                              <fo:table-column column-width="1.2cm" />
+
+                              <fo:table-column column-width="1.2cm" />
+
+                              <fo:table-column column-width="7.9cm" />
+
+                              <fo:table-column column-width="0.9cm" />
+
+                              <fo:table-column column-width="1.4cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="0.9cm" />
+
+                              <fo:table-column column-width="1.1cm" />
+
+                              <fo:table-column column-width="1cm" />
+
+                              <fo:table-column column-width="0.9cm" />
+
+                              <fo:table-column column-width="0.7cm" />
+
+                              <fo:table-column column-width="0.7cm" />
+
+                              <fo:table-column column-width="0.7cm" />
+
+                              <fo:table-column column-width="2cm" />
+
+                              <fo:table-column column-width="0.9cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="1.5cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+<!-- Affichage de l'en-t�te des proprietes non baties -->
+                              <fo:table-header>
+                                 <fo:table-row>
+                                    <fo:table-cell number-columns-spanned="23" padding-top="1cm" padding-bottom="0.1cm">
+                                       <fo:block text-align="center" font-size="8pt" line-height="0.5cm" vertical-align="middle">PROPRIETES NON BATIES</fo:block>
+                                    </fo:table-cell>
+                                 </fo:table-row>
+
+                                 <fo:table-row>
+                                    <fo:table-cell number-columns-spanned="6" border="0.5pt solid black">
+                                       <fo:block text-align="center" font-size="8pt" line-height="0.5cm" vertical-align="middle">DESIGNATION DES PROPRIETES</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell number-columns-spanned="17" border="0.5pt solid black" border-left="hidden">
+                                       <fo:block text-align="center" font-size="8pt" line-height="0.5cm" vertical-align="middle">EVALUATION</fo:block>
+                                    </fo:table-cell>
+                                 </fo:table-row>
+
+<!-- Affichage des titres des colonnes des proprietes non baties -->
+                                 <fo:table-row>
+                                    <fo:table-cell border="0.5pt solid black">
+                                      <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">AN</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">SECTION</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">N�PLAN</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">N� Voirie</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">ADRESSE</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black" border-left="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">CODE RIVOLIs</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">N�PARC PRIM</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black" border-left="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">FP DP</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black" border-left="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">S TAR</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">SUF</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">GR/SS GR</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">CLASSE</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">NAT CULT</fo:block>
+                                    </fo:table-cell>
+
+<!-- Creation d'une table pour afficher le titre de colonne (CONTENANCE HA A CA) -->
+                                    <fo:table-cell number-columns-spanned="3" border="0.5pt solid black">
+                                       <fo:table table-layout="fixed" border-collapse="collapse" font-size="6pt" width="100%">
+                                          <fo:table-body>
+                                             <fo:table-row>
+                                                <fo:table-cell number-columns-spanned="3" padding-top="0.05cm">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">CONTENANCE</fo:block>
+                                                </fo:table-cell>
+                                             </fo:table-row>
+
+                                             <fo:table-row>
+                                                <fo:table-cell>
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">HA</fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell>
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">A</fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell>
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">CA</fo:block>
+                                                </fo:table-cell>
+                                             </fo:table-row>
+                                          </fo:table-body>
+                                       </fo:table>
+                                    </fo:table-cell>
+
+<!-- Suite de l'affichage des titres des colonnes des proprietes non baties -->
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">REVENU CADASTRAL</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">COLL</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">NAT EXO</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">AN RET</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">FRACTION RC EXO</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">% EXO</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">POS</fo:block>
+                                    </fo:table-cell>
+                                 </fo:table-row>
+                              </fo:table-header>
+
+                              <fo:table-footer>
+                                 <fo:table-row>
+                                    <fo:table-cell border-bottom="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-bottom="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-bottom="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-bottom="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-bottom="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-bottom="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-bottom="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-bottom="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-bottom="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-bottom="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-bottom="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-bottom="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-bottom="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell number-columns-spanned="3" border-bottom="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-bottom="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-bottom="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-bottom="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-bottom="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-bottom="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-bottom="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-bottom="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+                                 </fo:table-row>
+                              </fo:table-footer>
+
+<!-- Affichage des donnees des proprietes non baties -->
+							<fo:table-body>
+								<fo:table-row>
+									<fo:table-cell>
+										<fo:block></fo:block>
+									</fo:table-cell>
+								</fo:table-row>
+
+								<xsl:for-each select="Mj/Mj_Compte_Communal/Mj_Parcelle | Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle">
+									<xsl:sort select="@section" />
+									<xsl:sort select="@num_plan" data-type="number"/>
+									<fo:table-row>
+										<xsl:choose>
+											<xsl:when test="Mj_Suf/@num_voirie = '*****' ">
+												<!-- Premiere ligne si la parcelle est concern�es par un lot en Biens Non d�limit�s -->
+												<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+														<xsl:value-of select="@date" />
+													</fo:block>
+												</fo:table-cell>
+												<fo:table-cell padding-right="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="right" vertical-align="middle" line-height="0.5cm">
+														<xsl:value-of select="@section" />
+													</fo:block>
+												</fo:table-cell>
+												<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+														<xsl:value-of select="@num_plan" />
+													</fo:block>
+												</fo:table-cell>
+												<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+														<xsl:value-of select="@num_voirie" />
+													</fo:block>
+												</fo:table-cell>
+												<fo:table-cell padding-left="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block vertical-align="middle" line-height="0.5cm">
+														<xsl:value-of select="@adresse" />
+													</fo:block>
+												</fo:table-cell>
+												<fo:table-cell padding-left="0.1cm">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+														<xsl:value-of select="@code_rivoli" />
+													</fo:block>
+												</fo:table-cell>
+												<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+														<xsl:value-of select="@num_parc_prim" />
+													</fo:block>
+												</fo:table-cell>
+												<fo:table-cell>
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+														<xsl:value-of select="@fp_dp" />
+													</fo:block>
+												</fo:table-cell>
+												<fo:table-cell>
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm"></fo:block>
+												</fo:table-cell>
+												<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm"></fo:block>
+												</fo:table-cell>
+												<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm"></fo:block>
+												</fo:table-cell>
+												<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm"></fo:block>
+												</fo:table-cell>
+												<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm"></fo:block>
+												</fo:table-cell>
+												<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm"></fo:block>
+												</fo:table-cell>
+												<fo:table-cell>
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm"></fo:block>
+												</fo:table-cell>
+												<fo:table-cell>
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm"></fo:block>
+												</fo:table-cell>
+												<fo:table-cell padding-right="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="right" vertical-align="middle" line-height="0.5cm"></fo:block>
+												</fo:table-cell>
+												<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm"></fo:block>
+												</fo:table-cell>
+												<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm"></fo:block>
+												</fo:table-cell>
+												<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm"></fo:block>
+												</fo:table-cell>
+												<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm"></fo:block>
+												</fo:table-cell>
+												<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm"></fo:block>
+												</fo:table-cell>
+												<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm"></fo:block>
+												</fo:table-cell>
+											</xsl:when>
+											<xsl:otherwise>
+												<!-- Premiere ligne si la parcelle n'est pas concern�e par un lot en Biens Non d�limit�s -->
+												<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+														<xsl:value-of select="@date" />
+													</fo:block>
+												</fo:table-cell>
+												<fo:table-cell padding-right="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="right" vertical-align="middle" line-height="0.5cm">
+														<xsl:value-of select="@section" />
+													</fo:block>
+												</fo:table-cell>
+												<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+														<xsl:value-of select="@num_plan" />
+													</fo:block>
+												</fo:table-cell>
+												<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+														<xsl:value-of select="@num_voirie" />
+													</fo:block>
+												</fo:table-cell>
+												<fo:table-cell padding-left="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block vertical-align="middle" line-height="0.5cm">
+														<xsl:value-of select="@adresse" />
+													</fo:block>
+												</fo:table-cell>
+												<fo:table-cell padding-left="0.1cm">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+														<xsl:value-of select="@code_rivoli" />
+													</fo:block>
+												</fo:table-cell>
+												<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+														<xsl:value-of select="@num_parc_prim" />
+													</fo:block>
+												</fo:table-cell>
+												<fo:table-cell>
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+														<xsl:value-of select="@fp_dp" />
+													</fo:block>
+												</fo:table-cell>
+												<fo:table-cell>
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+														<xsl:value-of select="@s_tar" />
+													</fo:block>
+												</fo:table-cell>
+												<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+														<xsl:value-of select="@suf" />
+													</fo:block>
+												</fo:table-cell>
+												<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+														<xsl:value-of select="@grss_gr" />
+													</fo:block>
+												</fo:table-cell>
+												<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+														<xsl:value-of select="@clas" />
+													</fo:block>
+												</fo:table-cell>
+												<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+														<xsl:value-of select="@nat_cult" />
+													</fo:block>
+												</fo:table-cell>
+												<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+														<xsl:value-of select="@ha" />
+													</fo:block>
+												</fo:table-cell>
+												<fo:table-cell>
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+														<xsl:value-of select="@a" />
+													</fo:block>
+												</fo:table-cell>
+												<fo:table-cell>
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+														<xsl:value-of select="@ca" />
+													</fo:block>
+												</fo:table-cell>
+												<!-- Affichage de la colonne revenu cadastral lorsqu'il a une seule suf -->
+												<xsl:if test="count(Mj_Suf)=1">
+													<fo:table-cell padding-right="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+														<fo:block text-align="right" vertical-align="middle" line-height="0.5cm">
+															<xsl:value-of select="@revenu_cadastral" />
+														</fo:block>
+													</fo:table-cell>
+												</xsl:if>
+												<!-- Affichage de la colonne revenu cadastral lorsqu'il a plusieurs sufs -->
+												<xsl:if test="count(Mj_Suf) &gt; 1">
+													<fo:table-cell padding-right="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+														<fo:block text-align="right" vertical-align="middle" line-height="0.5cm"></fo:block>
+													</fo:table-cell>
+												</xsl:if>
+												<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+												</fo:table-cell>
+												<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+														<xsl:value-of select="Mj_Suf/@nat_exo" />
+													</fo:block>
+												</fo:table-cell>
+												<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+												</fo:table-cell>
+												<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+												</fo:table-cell>
+												<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+												</fo:table-cell>
+												<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+												</fo:table-cell>
+											</xsl:otherwise>
+										</xsl:choose>
+									</fo:table-row>
+<!-- Suite de l'affichage des donnees des proprietes non baties - Affichage des SUF-->
+									<xsl:if test="count(Mj_Suf) > 0">
+										<xsl:choose>
+											<xsl:when test="count(Mj_Suf) = 1">
+												<xsl:if test="count(Mj_Suf/Mj_Exon_Suf) > 0">
+													<xsl:for-each select="Mj_Suf/Mj_Exon_Suf">
+														<fo:table-row>
+															<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+															</fo:table-cell>
+															<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+															</fo:table-cell>
+															<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+															</fo:table-cell>
+															<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+															</fo:table-cell>
+															<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+															</fo:table-cell>
+															<fo:table-cell>
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+															</fo:table-cell>
+															<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+															</fo:table-cell>
+															<fo:table-cell>
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+															</fo:table-cell>
+															<fo:table-cell>
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+															</fo:table-cell>
+															<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+															</fo:table-cell>
+															<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+															</fo:table-cell>
+															<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+															</fo:table-cell>
+															<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+															</fo:table-cell>
+															<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+															</fo:table-cell>
+															<fo:table-cell>
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+															</fo:table-cell>
+															<fo:table-cell>
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+															</fo:table-cell>
+															<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																<fo:block text-align="right" vertical-align="middle" line-height="0.25cm"></fo:block>
+															</fo:table-cell>
+															<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+																	<xsl:value-of select="@ccolloc" />
+																</fo:block>
+															</fo:table-cell>
+															<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+																	<xsl:value-of select="@nat_exo" />
+																</fo:block>
+															</fo:table-cell>
+															<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+																	<xsl:value-of select="@pexn div 100" />
+																</fo:block>
+															</fo:table-cell>
+															<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+																	<xsl:value-of select="@rcexnba div 100" />
+																</fo:block>
+															</fo:table-cell>
+															<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+															</fo:table-cell>
+															<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+															</fo:table-cell>
+														</fo:table-row>
+													</xsl:for-each>
+												</xsl:if>
+											</xsl:when>
+											<xsl:otherwise>
+<!-- Affichage des Suf lorsqu'il y en a plusieurs -->
+												<xsl:if test="count(Mj_Suf) &gt; 1">
+													<xsl:for-each select="Mj_Suf">
+														<fo:table-row>
+															<xsl:choose>
+																<xsl:when test="@num_voirie = '*****' ">
+																	<!-- La SUF est concern�e par un lot en Biens Non d�limit�s -->
+																	<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																		<fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+																			<xsl:value-of select="../@date" />
+																		</fo:block>
+																	</fo:table-cell>
+																	<fo:table-cell padding-right="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																		<fo:block text-align="right" vertical-align="middle" line-height="0.5cm">
+																			<xsl:value-of select="../@section" />
+																		</fo:block>
+																	</fo:table-cell>
+																	<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																		<fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+																			<xsl:value-of select="../@num_plan" />
+																		</fo:block>
+																	</fo:table-cell>
+																	<fo:table-cell padding-left="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																		<fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+																			<xsl:value-of select="@num_voirie" />
+																		</fo:block>
+																	</fo:table-cell>
+																	<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																		<fo:block vertical-align="middle" line-height="0.25cm">
+																			<xsl:text>&#160;</xsl:text><xsl:value-of select="@dnupdl" /> LOT <xsl:value-of select="@dnulot" /><xsl:text>&#160;</xsl:text><xsl:value-of select="@dnumql" />/<xsl:value-of select="@ddenql" />
+																		</fo:block>
+																	</fo:table-cell>
+																</xsl:when>
+																<xsl:otherwise>
+																	<!-- La SUF n'est pas concern�e par un lot en Biens Non d�limit�s -->
+																	<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																		<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+																	</fo:table-cell>
+																	<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																		<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+																	</fo:table-cell>
+																	<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																		<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+																	</fo:table-cell>
+																	<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																		<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+																	</fo:table-cell>
+																	<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																		<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+																	</fo:table-cell>
+																</xsl:otherwise>
+															</xsl:choose>
+															<fo:table-cell>
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+															</fo:table-cell>
+															<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+															</fo:table-cell>
+															<fo:table-cell>
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+															</fo:table-cell>
+															<fo:table-cell>
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+																	<xsl:value-of select="@s_tar" />
+																</fo:block>
+															</fo:table-cell>
+															<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+																	<xsl:value-of select="@suf" />
+																</fo:block>
+															</fo:table-cell>
+															<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+																	<xsl:value-of select="@grss_gr" />
+																</fo:block>
+															</fo:table-cell>
+															<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+																	<xsl:value-of select="@clas" />
+																</fo:block>
+															</fo:table-cell>
+															<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+																	<xsl:value-of select="@nat_cult" />
+																</fo:block>
+															</fo:table-cell>
+															<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+																	<xsl:value-of select="@ha" />
+																</fo:block>
+															</fo:table-cell>
+															<fo:table-cell>
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+																	<xsl:value-of select="@a" />
+																</fo:block>
+															</fo:table-cell>
+															<fo:table-cell>
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+																	<xsl:value-of select="@ca" />
+																</fo:block>
+															</fo:table-cell>
+															<fo:table-cell padding-right="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																<fo:block text-align="right" vertical-align="middle" line-height="0.25cm">
+																	<xsl:value-of select="@revenu_cadastral" />
+																</fo:block>
+															</fo:table-cell>
+															<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+															</fo:table-cell>
+															<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+																	<xsl:value-of select="@nat_exo" />
+																</fo:block>
+															</fo:table-cell>
+															<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+															</fo:table-cell>
+															<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+															</fo:table-cell>
+															<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+															</fo:table-cell>
+															<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+															</fo:table-cell>
+														</fo:table-row>
+														<!-- Affichage des Exon_Suf lorsqu'il y en a -->
+														<xsl:if test="count(Mj_Exon_Suf) &gt; 0">
+															<xsl:for-each select="Mj_Exon_Suf">
+																<fo:table-row>
+																	<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																		<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+																	</fo:table-cell>
+																	<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																		<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+																	</fo:table-cell>
+																	<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																		<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+																	</fo:table-cell>
+																	<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																		<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+																	</fo:table-cell>
+																	<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																		<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+																	</fo:table-cell>
+																	<fo:table-cell>
+																		<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+																	</fo:table-cell>
+																	<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																		<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+																	</fo:table-cell>
+																	<fo:table-cell>
+																		<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+																	</fo:table-cell>
+																	<fo:table-cell>
+																		<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+																	</fo:table-cell>
+																	<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																		<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+																	</fo:table-cell>
+																	<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																		<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+																	</fo:table-cell>
+																	<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																		<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+																	</fo:table-cell>
+																	<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																		<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+																	</fo:table-cell>
+																	<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																		<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+																	</fo:table-cell>
+																	<fo:table-cell>
+																		<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+																	</fo:table-cell>
+																	<fo:table-cell>
+																		<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+																	</fo:table-cell>
+																	<fo:table-cell padding-right="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																		<fo:block text-align="right" vertical-align="middle" line-height="0.25cm"></fo:block>
+																	</fo:table-cell>
+																	<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																		<fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+																			<xsl:value-of select="@ccolloc" />
+																		</fo:block>
+																	</fo:table-cell>
+																	<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																		<fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+																			<xsl:value-of select="@nat_exo" />
+																		</fo:block>
+																	</fo:table-cell>
+																	<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																		<fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+																			<xsl:value-of select="@pexn div 100" />
+																		</fo:block>
+																	</fo:table-cell>
+																	<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																		<fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+																			<xsl:value-of select="@rcexnba div 100" />
+																		</fo:block>
+																	</fo:table-cell>
+																	<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																		<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+																	</fo:table-cell>
+																	<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																		<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+																	</fo:table-cell>
+																</fo:table-row>
+															</xsl:for-each>
+														</xsl:if>
+													</xsl:for-each>
+												</xsl:if>
+											</xsl:otherwise>
+										</xsl:choose>
+									</xsl:if>
+								</xsl:for-each>
+                              </fo:table-body>
+                           </fo:table>
+                        </fo:table-cell>
+                     </fo:table-row>
+
+<!-- Affichage du pied du tableau des proprietes non baties -->
+                     <fo:table-row>
+                        <fo:table-cell>
+                           <fo:block keep-together="always" keep-with-previous="always">
+                              <fo:table width="26.6cm" table-layout="fixed" border-color="black" border-right="0.5pt" border-left="0.5pt" border-top="0pt" border-bottom="0.5pt" border-style="solid" border-collapse="collapse" font-size="6pt" padding-top="0.2cm" padding-bottom="0.1cm">
+                                 <fo:table-column column-width="1cm" />
+                                 <fo:table-column column-width="1cm" />
+                                 <fo:table-column column-width="1cm" />
+                                 <fo:table-column column-width="1cm" />
+                                 <fo:table-column column-width="3.9cm" />
+                                 <fo:table-column column-width="2cm" />
+                                 <fo:table-column column-width="2cm" />
+                                 <fo:table-column column-width="1.5cm" />
+                                 <fo:table-column column-width="2cm" />
+                                 <fo:table-column column-width="2cm" />
+                                 <fo:table-column column-width="1.5cm" />
+                                 <fo:table-column column-width="2cm" />
+                                 <fo:table-column column-width="2cm" />
+                                 <fo:table-column column-width="1.5cm" />
+                                 <fo:table-column column-width="2cm" />
+                                 <fo:table-column column-width="2.3cm" />
+                                 <fo:table-body>
+                                    <xsl:for-each select="Mj/Mj_Compte_Communal | Mj/Mj_Compte_Communal_Parcelle">
+                                       <fo:table-row>
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="center" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">HA</fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="center" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">A</fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="center" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">CA</fo:block>
+                                          </fo:table-cell>
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">R EXO</fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">
+                                             <xsl:value-of select="@exo_com_par_float" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">R EXO</fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">
+                                             <xsl:value-of select="@exo_tax_ad_par_float" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell >
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+                                       </fo:table-row>
+                                       <fo:table-row>
+                                          <fo:table-cell>
+                                             <fo:block text-align="left" line-height="0.60cm" vertical-align="middle">CONT</fo:block>
+                                          </fo:table-cell>
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+									      <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell >
+                                             <fo:block text-align="right" line-height="0.60cm" vertical-align="middle">REV IMPOSABLE</fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.60cm" vertical-align="middle">
+                                             <xsl:value-of select="@rev_impo_par_float" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.60cm" vertical-align="middle">COM</fo:block>
+                                          </fo:table-cell>
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell >
+                                             <fo:block text-align="right" line-height="0.60cm" vertical-align="middle">TAXE AD</fo:block>
+                                          </fo:table-cell>
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell >
+                                             <fo:block text-align="right" line-height="0.60cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell padding-right="0.8cm">
+                                             <fo:block text-align="right" line-height="0.60cm" vertical-align="middle">MAJ POS</fo:block>
+                                          </fo:table-cell>
+                                       </fo:table-row>
+                                       <fo:table-row>
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle">
+                                             </fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="center" line-height="0.20cm" vertical-align="middle">
+                                                <xsl:value-of select="@ha" />
+                                             </fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="center" line-height="0.20cm" vertical-align="middle">
+                                                <xsl:value-of select="@a" />
+                                             </fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="center" line-height="0.20cm" vertical-align="middle">
+                                                <xsl:value-of select="@ca" />
+                                             </fo:block>
+                                          </fo:table-cell>
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle">R IMP</fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle">
+                                             <xsl:value-of select="@rev_impo_com_par_float" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle">R IMP</fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle">
+                                             <xsl:value-of select="@rev_impo_tax_ad_par_float" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+                                       </fo:table-row>
+                                    </xsl:for-each>
+                                 </fo:table-body>
+
+<!-- Fin de la table du pied du tableau des propi�t�s non baties -->
+                              </fo:table>
+                           </fo:block>
+                        </fo:table-cell>
+                     </fo:table-row>
+
+<!-- Fin du corps du tableau global -->
+                  </fo:table-body>
+
+<!-- Fin du tableau global -->
+               </fo:table>
+
+               <fo:block id="theEnd" />
+            </fo:flow>
+         </fo:page-sequence>
+      </fo:root>
+   </xsl:template>
+</xsl:stylesheet>
+
diff --git a/src/module_cadastre/web_service/class/majic_lib/xsl/Mj_fo_Restreint.xsl b/src/module_cadastre/web_service/class/majic_lib/xsl/Mj_fo_Restreint.xsl
new file mode 100755
index 0000000000000000000000000000000000000000..995c9dec18d223052c51cd70615ef2ae056c63c8
--- /dev/null
+++ b/src/module_cadastre/web_service/class/majic_lib/xsl/Mj_fo_Restreint.xsl
@@ -0,0 +1,1791 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+   <xsl:template match="/">
+      <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+         <fo:layout-master-set>
+            <fo:simple-page-master master-name="simple" page-height="21cm" page-width="29.7cm" margin-top="0.5cm" margin-bottom="0.5cm" margin-left="0.5cm" margin-right="0.5cm">
+               <fo:region-body margin="0.5cm 0 0.5cm 0" />
+            </fo:simple-page-master>
+         </fo:layout-master-set>
+
+         <fo:page-sequence master-reference="simple" font-family="Times">
+<!-- Tableau global bas� sur la structure de la premi�re ligne du relev� de propri�t� -->
+            <fo:flow flow-name="xsl-region-body">
+               <fo:table table-layout="fixed" width="100%" border-collapse="collapse" font-size="7pt">
+                  <fo:table-column column-width="28.7" />
+
+<!-- D�but de l'en-t�te qui se retrouvera sur chaque page du RP -->
+                  <fo:table-header>
+				  <fo:table-row>
+                  <fo:table-cell>
+                  <fo:table table-layout="fixed" width="100%" border-collapse="collapse" font-size="7pt">
+				  <fo:table-column column-width="1.2cm" />
+
+                  <fo:table-column column-width="0.6cm" />
+
+                  <fo:table-column column-width="0.6cm" />
+
+                  <fo:table-column column-width="0.9cm" />
+
+                  <fo:table-column column-width="0.9cm" />
+
+                  <fo:table-column column-width="6.4cm" />
+
+                  <fo:table-column column-width="15.4cm" />
+
+                  <fo:table-column column-width="1.8cm" />
+
+                  <fo:table-column column-width="0.9cm" />
+				  <fo:table-body>
+                     <xsl:for-each select="Mj/Mj_Compte_Communal | Mj/Mj_Compte_Communal_Parcelle">
+                        <fo:table-row>
+                           <fo:table-cell border-color="black" border-style="solid" border-right="hidden" border-width="0.5pt">
+                              <fo:block text-align="center" line-height="0.25cm" vertical-align="middle">ANNEE DE MAJ</fo:block>
+                           </fo:table-cell>
+
+                           <fo:table-cell border-color="black" border-style="solid" border-right="hidden" border-width="0.5pt">
+                              <fo:block text-align="center" line-height="0.5cm" vertical-align="middle">
+                                 <xsl:value-of select="@annee_de_maj" />
+                              </fo:block>
+                           </fo:table-cell>
+
+                           <fo:table-cell border-color="black" border-style="solid" border-right="hidden" border-width="0.5pt">
+                              <fo:block text-align="center" line-height="0.25cm" vertical-align="middle">DEP DIR</fo:block>
+                           </fo:table-cell>
+
+                           <fo:table-cell border-color="black" border-style="solid" border-right="hidden" border-width="0.5pt">
+                              <fo:block text-align="center" line-height="0.5cm" vertical-align="middle">
+                                 <xsl:value-of select="@dep_dir" />
+                              </fo:block>
+                           </fo:table-cell>
+
+                           <fo:table-cell border-color="black" border-style="solid" border-right="hidden" border-width="0.5pt">
+                              <fo:block text-align="center" line-height="0.5cm" vertical-align="middle">COM</fo:block>
+                           </fo:table-cell>
+
+                           <fo:table-cell border-color="black" border-style="solid" padding-left="0.1cm" border-width="0.5pt">
+                              <fo:block line-height="0.5cm" vertical-align="middle">
+                                 <xsl:value-of select="@com" />
+                              </fo:block>
+                           </fo:table-cell>
+
+                           <fo:table-cell>
+                              <fo:block text-align="center" line-height="0.5cm" vertical-align="middle" font-size="16pt" font-style="italic">RELEVE DE PROPRIETE ( 
+                              <fo:page-number />
+
+                              / 
+                              <fo:page-number-citation ref-id="theEnd" />
+
+                              )</fo:block>
+                           </fo:table-cell>
+
+                           <fo:table-cell border-color="black" border-style="solid" border-right="hidden" border-width="0.5pt">
+                              <fo:block text-align="center" line-height="0.25cm" vertical-align="middle">NUMERO COMMUNAL</fo:block>
+                           </fo:table-cell>
+
+                           <fo:table-cell border-color="black" border-style="solid" border-width="0.5pt">
+                              <fo:block text-align="center" line-height="0.5cm" vertical-align="middle">
+                                 <xsl:value-of select="substring(@numero_communal,6)" />
+                              </fo:block>
+                           </fo:table-cell>
+                        </fo:table-row>
+                     </xsl:for-each>
+					 </fo:table-body>
+					 </fo:table>
+					 </fo:table-cell>
+                     </fo:table-row>
+
+<!-- Affichage de la ligne titre "PROPRIETAIRE" -->
+                     <fo:table-row>
+                        <fo:table-cell>
+                           <fo:table table-layout="fixed" width="100%" border-collapse="collapse" font-size="7pt">
+                              <fo:table-column column-width="28.7cm" />
+
+                              <fo:table-body>
+                                 <fo:table-row>
+                                    <fo:table-cell padding-top="0.5cm" padding-bottom="0.1cm">
+                                       <fo:block font-size="8pt" text-align="center">PROPRIETAIRE</fo:block>
+                                    </fo:table-cell>
+                                 </fo:table-row>
+                              </fo:table-body>
+                           </fo:table>
+                        </fo:table-cell>
+                     </fo:table-row>
+
+<!-- Affichage du tableau proprietaire -->
+                     <fo:table-row>
+                        <fo:table-cell>
+                           <fo:table table-layout="fixed" border-color="black" border="0.5pt" border-style="solid" border-collapse="collapse" width="100%" font-size="8pt" padding-top="0.2cm" padding-bottom="0.1cm">
+                              <fo:table-column column-width="28.7cm" />
+
+                              
+
+                              <fo:table-body>
+                                 <xsl:for-each select="Mj/Mj_Compte_Communal/Mj_Proprietaire | Mj/Mj_Compte_Communal_Parcelle/Mj_Proprietaire">
+                                    <fo:table-row>
+                                       <fo:table-cell>
+                                          <fo:block>
+                                          <xsl:value-of select="@l_ccodro" />
+
+                                          � 
+                                          <xsl:value-of select="@l_ccodem" />
+
+                                          � 
+                                          <xsl:value-of select="@dnuper" />
+
+                                          � 
+                                          <xsl:value-of select="@proprietaire_nom_tiers" />
+                                          </fo:block>
+                                       </fo:table-cell>
+                                    </fo:table-row>
+
+                                    <fo:table-row>
+                                       <fo:table-cell padding-left="0.3cm">
+                                          <fo:block>
+                                             <xsl:value-of select="@proprietaire_adresse" />
+                                          </fo:block>
+                                       </fo:table-cell>
+                                    </fo:table-row>
+                                 </xsl:for-each>
+                              </fo:table-body>
+                           </fo:table>
+                        </fo:table-cell>
+                     </fo:table-row>
+                  </fo:table-header>
+
+<!-- Fin de l'en-t�te -->
+<!-- D�but du corps du tableau global -->
+                  <fo:table-body>
+<!-- Affichage des poprietes baties -->
+                     <fo:table-row>
+                        <fo:table-cell>
+                           <fo:table table-layout="fixed" width="100%" border-collapse="collapse" font-size="7pt">
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="1.2cm" />
+
+                              <fo:table-column column-width="1cm" />
+
+                              <fo:table-column column-width="0.4cm" />
+
+                              <fo:table-column column-width="1.2cm" />
+
+                              <fo:table-column column-width="11.3cm" />
+
+                              <fo:table-column column-width="0.9cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="1.2cm" />
+
+                              <fo:table-column column-width="1.8cm" />
+
+                              <fo:table-column column-width="0.7cm" />
+
+                              <fo:table-column column-width="0.7cm" />
+
+                              <fo:table-column column-width="0.4cm" />
+
+                              <fo:table-column column-width="1.2cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="2.4cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="0.7cm" />
+
+<!-- Affichage de l'en-t�te des propri�t�s baties -->
+                              <fo:table-header>
+                                 <fo:table-row>
+                                    <fo:table-cell border-color="black" border-style="solid" number-columns-spanned="20" border-left="hidden" border-right="hidden" border-top="hidden" border-bottom="hidden" border-width="0.5pt" padding-top="1cm" padding-bottom="0.1cm">
+                                       <fo:block text-align="center" font-size="8pt" line-height="0.5cm" vertical-align="middle">PROPRIETES BATIES</fo:block>
+                                    </fo:table-cell>
+                                 </fo:table-row>
+
+                                 <fo:table-row>
+                                    <fo:table-cell border-color="black" border-style="solid" number-columns-spanned="7" border-right="hidden" border-bottom="hidden" border-width="0.5pt">
+                                       <fo:block text-align="center" font-size="8pt" line-height="0.5cm" vertical-align="middle">DESIGNATION DES PROPRIETES</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-style="solid" number-columns-spanned="5" border-left="hidden" border-bottom="hidden" border-right="hidden" border-width="0.5pt">
+                                       <fo:block text-align="center" font-size="8pt" line-height="0.5cm" vertical-align="middle">IDENTIFICATION DU LOCAL</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-style="solid" number-columns-spanned="8" border-left="hidden" border-bottom="hidden" border-width="0.5pt">
+                                       <fo:block text-align="center" font-size="8pt" line-height="0.5cm" vertical-align="middle">EVALUATION DU LOCAL</fo:block>
+                                    </fo:table-cell>
+                                 </fo:table-row>
+
+<!-- Affichage des titres des colonnes des propri�t�s baties -->
+                                 <fo:table-row>
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden">
+                                      <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">AN</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">SECTION</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">N�PLAN</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">CP</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">N� Voirie</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">ADRESSE</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-left="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">CODE RIVOLI</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">BAT</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">ENT</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">NIV</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">N�PORTE</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">N�INVAR</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">S TAR</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">M EVAL</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">AF</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">NAT LOC</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">CAT</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">REVENU CADASTRAL</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">TX OM</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">COEF</fo:block>
+                                    </fo:table-cell>
+                                 </fo:table-row>
+                              </fo:table-header>
+
+                              <fo:table-footer>
+                                 <fo:table-row>
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+                                 </fo:table-row>
+                              </fo:table-footer>
+
+<!-- Affichage des donn�es des propri�t�s baties -->
+                              <fo:table-body>
+                                 <fo:table-row>
+                                    <fo:table-cell>
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+                                 </fo:table-row>
+
+                                 <xsl:for-each select="Mj/Mj_Compte_Communal/Mj_Bati | Mj/Mj_Compte_Communal_Parcelle/Mj_Bati">
+								  <xsl:sort select="@section" />
+									<xsl:sort select="@num_plan" data-type="number"/>
+                                    <fo:table-row>
+                                       <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@date" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell padding-right="0.1cm" border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="right" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@section" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@num_plan" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@cp" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@voirie" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell padding-left="0.1cm" border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                          <fo:block vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@adresse" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-left="hidden" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@code_rivoli" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@bat" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@ent" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@niv" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@num_de_porte" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell padding-left="0.1cm" border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                          <fo:block vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@num_invar" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+<!--Affichage du PEV lorsqu'il n'y en a qu'un (m�me ligne) -->
+                                       <xsl:if test="count(Mj_Pev) = 1">
+                                          <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="@s_tar" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="@m_eva" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="@af" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="@nat_loc" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="@cat" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell padding-right="0.1cm" border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="right" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="@revenu_cadastral" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="@tx_om" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             </fo:block>
+                                          </fo:table-cell>
+                                       </xsl:if>
+
+<!--Affichage du premier PEV lorsqu'il y en a plusieurs (m�me ligne) -->
+                                       <xsl:if test="count(Mj_Pev) &gt; 1">
+                                          <xsl:for-each select="Mj_Pev">
+                                             <xsl:if test="position()=1">
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                      <xsl:value-of select="@s_tar" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                      <xsl:value-of select="../@m_eva" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                      <xsl:value-of select="@af" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                      <xsl:value-of select="../@nat_loc" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                      <xsl:value-of select="@cat" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell padding-right="0.1cm" border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="right" vertical-align="middle" line-height="0.5cm">
+                                                      <xsl:value-of select="@revenu_cadastral" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+                                             </xsl:if>
+                                          </xsl:for-each>
+                                       </xsl:if>
+                                    </fo:table-row>
+
+<!--Affichage des PEV suivants (lignes suivantes) -->
+                                    <xsl:if test="count(Mj_Pev) &gt; 1">
+                                       <xsl:for-each select="Mj_Pev">
+                                          <xsl:if test="position()&gt;1">
+                                             <fo:table-row>
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                      <xsl:value-of select="@s_tar" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                      <xsl:value-of select="../@m_eva" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                      <xsl:value-of select="@af" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                      <xsl:value-of select="../@nat_loc" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                      <xsl:value-of select="@cat" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell padding-right="0.1cm" border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="right" vertical-align="middle" line-height="0.25cm">
+                                                      <xsl:value-of select="@revenu_cadastral" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+                                             </fo:table-row>
+
+                                             <fo:table-row>
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell padding-right="0.1cm" border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="right" vertical-align="middle" line-height="0.25cm">
+                                                      <xsl:value-of select="../@revenu_cadastral" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                      <xsl:value-of select="../@tx_om" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+                                             </fo:table-row>
+                                          </xsl:if>
+                                       </xsl:for-each>
+                                    </xsl:if>
+
+<!--Affichage des Lot_Local s'il y en a -->
+                                    <xsl:if test="count(Mj_Lot_Local) &gt; 0">
+                                       <xsl:for-each select="Mj_Lot_Local">
+                                          <fo:table-row>
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell padding-left="0.4cm" border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                <fo:block vertical-align="middle" line-height="0.25cm">
+                                                   <xsl:value-of select="@lot" />
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell padding-right="0.1cm" border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="right" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+                                          </fo:table-row>
+                                       </xsl:for-each>
+                                    </xsl:if>
+                                 </xsl:for-each>
+                              </fo:table-body>
+                           </fo:table>
+                        </fo:table-cell>
+                     </fo:table-row>
+
+<!-- Affichage du pied du tableau des proprietes baties -->
+                     <fo:table-row>
+                        <fo:table-cell>
+                           <fo:block keep-together="always" keep-with-previous="always">
+                              <fo:table table-layout="fixed" border-collapse="collapse" width="28.7cm" border-color="black" border-right="0.5pt" border-left="0.5pt" border-top="0pt" border-bottom="0.5pt" border-style="solid" font-size="6pt" padding-top="0.2cm" padding-bottom="0.1cm">
+                                 <fo:table-column column-width="1.8cm" />
+
+                                 <fo:table-column column-width="2cm" />
+
+                                 <fo:table-column column-width="2.5cm" />
+
+                                 <fo:table-column column-width="1.5cm" />
+
+                                 <fo:table-column column-width="2cm" />
+
+                                 <fo:table-column column-width="2.5cm" />
+
+                                 <fo:table-column column-width="1.5cm" />
+
+                                 <fo:table-column column-width="2cm" />
+
+                                 <fo:table-column column-width="2.5cm" />
+
+                                 <fo:table-column column-width="1.5cm" />
+
+                                 <fo:table-column column-width="2cm" />
+
+                                 <fo:table-column column-width="6.9cm" />
+
+                                 <fo:table-body>
+                                    <xsl:for-each select="Mj/Mj_Compte_Communal | Mj/Mj_Compte_Communal_Parcelle">
+                                       
+                                       <fo:table-row>
+                                          <fo:table-cell>
+                                             <fo:block text-align="left" line-height="0.60cm" vertical-align="middle">REV IMPOSABLE</fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.60cm" vertical-align="middle">
+                                             <xsl:value-of select="@rev_impo_bati_float" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.60cm" vertical-align="middle">COM</fo:block>
+                                          </fo:table-cell>
+										  
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+										  
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell >
+                                             <fo:block text-align="right" line-height="0.60cm" vertical-align="middle">DEP</fo:block>
+                                          </fo:table-cell>
+										  
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+										  
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.60cm" vertical-align="middle">R</fo:block>
+                                          </fo:table-cell>
+										  
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+										  
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+										  
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+                                       </fo:table-row>
+
+                                       <fo:table-row>
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+										  
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+										  
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+										  
+                                          <fo:table-cell >
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle">R IMP</fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle">
+                                             <xsl:value-of select="@rev_impo_com_bati_float" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+										  
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell >
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle">R IMP</fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle">
+                                             <xsl:value-of select="@rev_impo_dep_bati_float" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+										  
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell >
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle">R IMP</fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle">
+                                             <xsl:value-of select="@rev_impo_reg_bati_float" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+										  
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+                                       </fo:table-row>
+                                    </xsl:for-each>
+                                 </fo:table-body>
+                              </fo:table>
+                           </fo:block>
+                        </fo:table-cell>
+                     </fo:table-row>
+
+<!-- Affichage des proprietes non baties -->
+                     <fo:table-row>
+                        <fo:table-cell>
+                           <fo:table table-layout="fixed" width="100%" border-collapse="collapse" font-size="7pt">
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="1.5cm" />
+
+                              <fo:table-column column-width="1.2cm" />
+
+                              <fo:table-column column-width="1.2cm" />
+
+                              <fo:table-column column-width="12.1cm" />
+
+                              <fo:table-column column-width="0.9cm" />
+
+                              <fo:table-column column-width="1.4cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="0.9cm" />
+
+                              <fo:table-column column-width="1.1cm" />
+
+                              <fo:table-column column-width="1cm" />
+
+                              <fo:table-column column-width="0.9cm" />
+
+                              <fo:table-column column-width="0.7cm" />
+
+                              <fo:table-column column-width="0.7cm" />
+
+                              <fo:table-column column-width="0.7cm" />
+
+                              <fo:table-column column-width="2cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+<!-- Affichage de l'en-t�te des proprietes non baties -->
+                              <fo:table-header>
+                                 <fo:table-row>
+                                    <fo:table-cell border-color="black" border-style="solid" number-columns-spanned="18" border-right="hidden" border-bottom="hidden" border-left="hidden" border-top="hidden" border-width="0.5pt" padding-top="1cm" padding-bottom="0.1cm">
+                                       <fo:block text-align="center" font-size="8pt" line-height="0.5cm" vertical-align="middle">PROPRIETES NON BATIES</fo:block>
+                                    </fo:table-cell>
+                                 </fo:table-row>
+
+                                 <fo:table-row>
+                                    <fo:table-cell border-color="black" border-style="solid" number-columns-spanned="6" border-right="hidden" border-bottom="hidden" border-width="0.5pt">
+                                       <fo:block text-align="center" font-size="8pt" line-height="0.5cm" vertical-align="middle">DESIGNATION DES PROPRIETES</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-style="solid" number-columns-spanned="12" border-left="hidden" border-bottom="hidden" border-width="0.5pt">
+                                       <fo:block text-align="center" font-size="8pt" line-height="0.5cm" vertical-align="middle">EVALUATION</fo:block>
+                                    </fo:table-cell>
+                                 </fo:table-row>
+
+<!-- Affichage des titres des colonnes des proprietes non baties -->
+                                 <fo:table-row>
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden">
+                                      <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">AN</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">SECTION</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">N�PLAN</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">N� Voirie</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">ADRESSE</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-left="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">CODE RIVOLI</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">N�PARC PRIM</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-left="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">FP DP</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-left="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">S TAR</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">SUF</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">GR/SS GR</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">CLASSE</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">NAT CULT</fo:block>
+                                    </fo:table-cell>
+
+<!-- Creation d'une table pour afficher le titre de colonne (CONTENANCE HA A CA) -->
+                                    <fo:table-cell number-columns-spanned="3" border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden">
+                                       <fo:table table-layout="fixed" border-collapse="collapse" font-size="6pt" width="100%">
+                                          <fo:table-body>
+                                             <fo:table-row>
+                                                <fo:table-cell number-columns-spanned="3" padding-top="0.05cm">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">CONTENANCE</fo:block>
+                                                </fo:table-cell>
+                                             </fo:table-row>
+
+                                             <fo:table-row>
+                                                <fo:table-cell>
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">HA</fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell>
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">A</fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell>
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">CA</fo:block>
+                                                </fo:table-cell>
+                                             </fo:table-row>
+                                          </fo:table-body>
+                                       </fo:table>
+                                    </fo:table-cell>
+
+<!-- Suite de l'affichage des titres des colonnes des proprietes non baties -->
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">REVENU CADASTRAL</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">POS</fo:block>
+                                    </fo:table-cell>
+                                 </fo:table-row>
+                              </fo:table-header>
+
+                              <fo:table-footer>
+                                 <fo:table-row>
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell number-columns-spanned="3" border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+                                 </fo:table-row>
+                              </fo:table-footer>
+
+<!-- Affichage des donnees des proprietes non baties -->
+                              <fo:table-body>
+                                 <fo:table-row>
+                                    <fo:table-cell>
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+                                 </fo:table-row>
+
+                                 <xsl:for-each select="Mj/Mj_Compte_Communal/Mj_Parcelle | Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle">
+								  <xsl:sort select="@section" />
+									<xsl:sort select="@num_plan" data-type="number"/>
+                                    <fo:table-row>
+                                       <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@date" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell padding-right="0.1cm" border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="right" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@section" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@num_plan" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@num_voirie" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell padding-left="0.1cm" border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                          <fo:block vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@adresse" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell padding-left="0.1cm" border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@code_rivoli" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@num_parc_prim" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@fp_dp" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@s_tar" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@suf" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@grss_gr" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@clas" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@nat_cult" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@ha" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@a" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@ca" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+<!-- Affichage de la colonne revenu cadastral lorsqu'il a une seule suf -->
+                                       <xsl:if test="count(Mj_Suf)=1">
+                                          <fo:table-cell padding-right="0.1cm" border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="right" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="@revenu_cadastral" />
+                                             </fo:block>
+                                          </fo:table-cell>
+                                       </xsl:if>
+
+<!-- Affichage de la colonne revenu cadastral lorsqu'il a plusieurs sufs -->
+                                       <xsl:if test="count(Mj_Suf) &gt; 1">
+                                          <fo:table-cell padding-right="0.1cm" border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="right" vertical-align="middle" line-height="0.5cm">
+                                             </fo:block>
+                                          </fo:table-cell>
+                                       </xsl:if>
+
+<!-- Suite de l'affichage des donnees des proprietes non baties -->
+                                       <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                          </fo:block>
+                                       </fo:table-cell>
+                                    </fo:table-row>
+
+<!-- Affichage des Suf lorsqu'il y en a plusieurs -->
+                                    <xsl:if test="count(Mj_Suf) &gt; 1">
+                                       <xsl:for-each select="Mj_Suf">
+                                          <fo:table-row>
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   <xsl:value-of select="@s_tar" />
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   <xsl:value-of select="@suf" />
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   <xsl:value-of select="@grss_gr" />
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   <xsl:value-of select="@clas" />
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   <xsl:value-of select="@nat_cult" />
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   <xsl:value-of select="@ha" />
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   <xsl:value-of select="@a" />
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   <xsl:value-of select="@ca" />
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell padding-right="0.1cm" border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="right" vertical-align="middle" line-height="0.25cm">
+                                                   <xsl:value-of select="@revenu_cadastral" />
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+                                          </fo:table-row>
+                                       </xsl:for-each>
+                                    </xsl:if>
+                                 </xsl:for-each>
+                              </fo:table-body>
+                           </fo:table>
+                        </fo:table-cell>
+                     </fo:table-row>
+
+<!-- Affichage du pied du tableau des proprietes non baties -->
+                     <fo:table-row>
+                        <fo:table-cell>
+                           <fo:block keep-together="always" keep-with-previous="always">
+                              <fo:table width="26.6cm" table-layout="fixed" border-color="black" border-right="0.5pt" border-left="0.5pt" border-top="0pt" border-bottom="0.5pt" border-style="solid" border-collapse="collapse" font-size="6pt" padding-top="0.2cm" padding-bottom="0.1cm">
+                                 <fo:table-column column-width="1cm" />
+
+                                 <fo:table-column column-width="1cm" />
+
+                                 <fo:table-column column-width="1cm" />
+
+                                 <fo:table-column column-width="1cm" />
+
+                                 <fo:table-column column-width="3.9cm" />
+
+                                 <fo:table-column column-width="2cm" />
+
+                                 <fo:table-column column-width="2cm" />
+
+                                 <fo:table-column column-width="1.5cm" />
+
+                                 <fo:table-column column-width="2cm" />
+
+                                 <fo:table-column column-width="2cm" />
+
+                                 <fo:table-column column-width="1.5cm" />
+
+                                 <fo:table-column column-width="2cm" />
+
+                                 <fo:table-column column-width="2cm" />
+
+                                 <fo:table-column column-width="1.5cm" />
+
+                                 <fo:table-column column-width="2cm" />
+
+                                 <fo:table-column column-width="2.3cm" />
+
+                                 <fo:table-body>
+                                    <xsl:for-each select="Mj/Mj_Compte_Communal | Mj/Mj_Compte_Communal_Parcelle">
+                                       <fo:table-row>
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle">
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="center" line-height="0.20cm" vertical-align="middle">HA</fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="center" line-height="0.20cm" vertical-align="middle">A</fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="center" line-height="0.20cm" vertical-align="middle">CA</fo:block>
+                                          </fo:table-cell>
+										  
+										  
+                                       </fo:table-row>
+
+                                       <fo:table-row>
+                                          <fo:table-cell>
+                                             <fo:block text-align="left" line-height="0.60cm" vertical-align="middle">CONT</fo:block>
+                                          </fo:table-cell>
+										  
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+										  
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+										  
+									      <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell >
+                                             <fo:block text-align="right" line-height="0.60cm" vertical-align="middle">REV IMPOSABLE</fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.60cm" vertical-align="middle">
+                                             <xsl:value-of select="@rev_impo_par_float" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.60cm" vertical-align="middle">COM</fo:block>
+                                          </fo:table-cell>
+										  
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+										  
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell >
+                                             <fo:block text-align="right" line-height="0.60cm" vertical-align="middle">TAXE AD</fo:block>
+                                          </fo:table-cell>
+										  
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+										  
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell >
+                                             <fo:block text-align="right" line-height="0.60cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+										  
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+										  
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell padding-right="0.8cm">
+                                             <fo:block text-align="right" line-height="0.60cm" vertical-align="middle">MAJ POS</fo:block>
+                                          </fo:table-cell>
+                                       </fo:table-row>
+
+                                       <fo:table-row>
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle">
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="center" line-height="0.20cm" vertical-align="middle">
+                                                <xsl:value-of select="@ha" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="center" line-height="0.20cm" vertical-align="middle">
+                                                <xsl:value-of select="@a" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="center" line-height="0.20cm" vertical-align="middle">
+                                                <xsl:value-of select="@ca" />
+                                             </fo:block>
+                                          </fo:table-cell>
+										  
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+										  
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+										  
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle">R IMP</fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle">
+                                             <xsl:value-of select="@rev_impo_com_par_float" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+										  
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle">R IMP</fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle">
+                                             <xsl:value-of select="@rev_impo_tax_ad_par_float" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+										  
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle">
+											</fo:block>
+                                          </fo:table-cell>
+										  
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+                                       </fo:table-row>
+                                    </xsl:for-each>
+                                 </fo:table-body>
+
+<!-- Fin de la table du pied du tableau des propi�t�s non baties -->
+                              </fo:table>
+                           </fo:block>
+                        </fo:table-cell>
+                     </fo:table-row>
+
+<!-- Fin du corps du tableau global -->
+                  </fo:table-body>
+
+<!-- Fin du tableau global -->
+               </fo:table>
+
+               <fo:block id="theEnd" />
+            </fo:flow>
+         </fo:page-sequence>
+      </fo:root>
+   </xsl:template>
+</xsl:stylesheet>
+
diff --git a/src/module_cadastre/web_service/class/majic_lib/xsl/Mj_fo_tiers.xsl b/src/module_cadastre/web_service/class/majic_lib/xsl/Mj_fo_tiers.xsl
new file mode 100755
index 0000000000000000000000000000000000000000..cd17f9b12e26db5237f4f795c440754ef83974fb
--- /dev/null
+++ b/src/module_cadastre/web_service/class/majic_lib/xsl/Mj_fo_tiers.xsl
@@ -0,0 +1,2037 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+   <xsl:template match="/">
+      <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+         <fo:layout-master-set>
+            <fo:simple-page-master master-name="simple" page-height="21cm" page-width="29.7cm" margin-top="0.5cm" margin-bottom="0.5cm" margin-left="0.5cm" margin-right="0.5cm">
+               <fo:region-body margin="0.5cm 0 0.5cm 0" />
+            </fo:simple-page-master>
+         </fo:layout-master-set>
+
+         <fo:page-sequence master-reference="simple" font-family="Times">
+<!-- Tableau global bas� sur la structure de la premi�re ligne du relev� de propri�t� -->
+            <fo:flow flow-name="xsl-region-body">
+               <fo:table table-layout="fixed" width="100%" border-collapse="collapse" font-size="7pt">
+                  <fo:table-column column-width="28.7" />
+
+<!-- D�but de l'en-t�te qui se retrouvera sur chaque page du RP -->
+                  <fo:table-header>
+				  <fo:table-row>
+                  <fo:table-cell>
+                  <fo:table table-layout="fixed" width="100%" border-collapse="collapse" font-size="7pt">
+				  <fo:table-column column-width="1.2cm" />
+                  <fo:table-column column-width="0.6cm" />
+                  <fo:table-column column-width="0.6cm" />
+                  <fo:table-column column-width="0.9cm" />
+                  <fo:table-column column-width="0.9cm" />
+                  <fo:table-column column-width="6.4cm" />
+                  <fo:table-column column-width="15.4cm" />
+                  <fo:table-column column-width="1.8cm" />
+                  <fo:table-column column-width="0.9cm" />
+				  <fo:table-body>
+                     <xsl:for-each select="Mj/Mj_Compte_Communal | Mj/Mj_Compte_Communal_Parcelle">
+                        <fo:table-row>
+                           <fo:table-cell border="0.5pt solid black">
+                              <fo:block text-align="center" line-height="0.25cm" vertical-align="middle">ANNEE DE MAJ</fo:block>
+                           </fo:table-cell>
+
+                           <fo:table-cell border="0.5pt solid black">
+                              <fo:block text-align="center" line-height="0.5cm" vertical-align="middle">
+                                 <xsl:value-of select="@annee_de_maj" />
+                              </fo:block>
+                           </fo:table-cell>
+
+                           <fo:table-cell border="0.5pt solid black">
+                              <fo:block text-align="center" line-height="0.25cm" vertical-align="middle">DEP DIR</fo:block>
+                           </fo:table-cell>
+
+                           <fo:table-cell border="0.5pt solid black">
+                              <fo:block text-align="center" line-height="0.5cm" vertical-align="middle">
+                                 <xsl:value-of select="@dep_dir" />
+                              </fo:block>
+                           </fo:table-cell>
+
+                           <fo:table-cell border="0.5pt solid black">
+                              <fo:block text-align="center" line-height="0.5cm" vertical-align="middle">COM</fo:block>
+                           </fo:table-cell>
+
+                           <fo:table-cell border-color="black" border-style="solid" padding-left="0.1cm" border-width="0.5pt">
+                              <fo:block line-height="0.5cm" vertical-align="middle">
+                                 <xsl:value-of select="@com" />
+                              </fo:block>
+                           </fo:table-cell>
+
+                           <fo:table-cell>
+                              <fo:block text-align="center" line-height="0.5cm" vertical-align="middle" font-size="16pt" font-style="italic">RELEVE DE PROPRIETE ( 
+                              <fo:page-number />
+
+                              / 
+                              <fo:page-number-citation ref-id="theEnd" />
+
+                              )</fo:block>
+                           </fo:table-cell>
+
+                           <fo:table-cell border="0.5pt solid black">
+                              <fo:block text-align="center" line-height="0.25cm" vertical-align="middle">NUMERO COMMUNAL</fo:block>
+                           </fo:table-cell>
+
+                           <fo:table-cell border-color="black" border-style="solid" border-width="0.5pt">
+                              <fo:block text-align="center" line-height="0.5cm" vertical-align="middle">
+                                 <xsl:value-of select="@numero_communal" />
+                              </fo:block>
+                           </fo:table-cell>
+                        </fo:table-row>
+                     </xsl:for-each>
+					 </fo:table-body>
+					 </fo:table>
+					 </fo:table-cell>
+                     </fo:table-row>
+
+<!-- Affichage de la ligne titre "PROPRIETAIRE" -->
+                     <fo:table-row>
+                        <fo:table-cell>
+                           <fo:table table-layout="fixed" width="100%" border-collapse="collapse" font-size="7pt">
+                              <fo:table-column column-width="28.7cm" />
+
+                              <fo:table-body>
+                                 <fo:table-row>
+                                    <fo:table-cell padding-top="0.5cm" padding-bottom="0.1cm">
+                                       <fo:block font-size="8pt" text-align="center">PROPRIETAIRE</fo:block>
+                                    </fo:table-cell>
+                                 </fo:table-row>
+                              </fo:table-body>
+                           </fo:table>
+                        </fo:table-cell>
+                     </fo:table-row>
+
+<!-- Affichage du tableau proprietaire -->
+                     <fo:table-row>
+                        <fo:table-cell>
+                           <fo:table table-layout="fixed" border-color="black" border="0.5pt" border-style="solid" border-collapse="collapse" width="100%" font-size="8pt" padding-top="0.2cm" padding-bottom="0.1cm">
+                              <fo:table-column column-width="21.7cm" />
+
+                              <fo:table-column column-width="7cm" />
+
+                              <fo:table-body>
+                                 <xsl:for-each select="Mj/Mj_Compte_Communal/Mj_Proprietaire | Mj/Mj_Compte_Communal_Parcelle/Mj_Proprietaire">
+                                    <fo:table-row>
+                                       <fo:table-cell>
+                                          <fo:block>
+                                          <!-- <xsl:value-of select="@l_ccodro" /> -->
+
+                                          � 
+                                          <!-- <xsl:value-of select="@l_ccodem" /> -->
+
+                                          � 
+                                          <xsl:value-of select="@dnuper" />
+
+<!-- Modification tiers par rapport au xsl par d�faut-->
+                                          � 
+                                          <xsl:value-of select="@proprietaire_nom_tiers" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell padding-left="0.3cm">
+                                          <fo:block>
+<!-- Modification tiers par rapport au xsl par d�faut-->
+                                          </fo:block>
+                                       </fo:table-cell>
+                                    </fo:table-row>
+
+                                    <fo:table-row>
+                                       <fo:table-cell padding-left="0.3cm">
+                                          <fo:block>
+                                             <xsl:value-of select="@proprietaire_adresse" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell>
+                                          <fo:block>
+<!-- Modification tiers par rapport au xsl par d�faut-->
+                                          </fo:block>
+                                       </fo:table-cell>
+                                    </fo:table-row>
+                                 </xsl:for-each>
+                              </fo:table-body>
+                           </fo:table>
+                        </fo:table-cell>
+                     </fo:table-row>
+                  </fo:table-header>
+
+<!-- Fin de l'en-t�te -->
+<!-- D�but du corps du tableau global -->
+                  <fo:table-body>
+<!-- Affichage des poprietes baties -->
+                     <fo:table-row>
+                        <fo:table-cell>
+                           <fo:table table-layout="fixed" width="100%" border-collapse="collapse" font-size="7pt">
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="1.2cm" />
+
+                              <fo:table-column column-width="1cm" />
+
+                              <fo:table-column column-width="0.4cm" />
+
+                              <fo:table-column column-width="1.2cm" />
+
+                              <fo:table-column column-width="6.4cm" />
+
+                              <fo:table-column column-width="0.9cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="1.2cm" />
+
+                              <fo:table-column column-width="1.8cm" />
+
+                              <fo:table-column column-width="0.7cm" />
+
+                              <fo:table-column column-width="0.7cm" />
+
+                              <fo:table-column column-width="0.4cm" />
+
+                              <fo:table-column column-width="1.2cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="2.4cm" />
+
+                              <fo:table-column column-width="0.7cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="1.8cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="0.7cm" />
+
+<!-- Affichage de l'en-t�te des propri�t�s baties -->
+                              <fo:table-header>
+                                 <fo:table-row>
+                                    <fo:table-cell number-columns-spanned="26" padding-top="1cm" padding-bottom="0.1cm">
+                                       <fo:block text-align="center" font-size="8pt" line-height="0.5cm" vertical-align="middle">PROPRIETES BATIES</fo:block>
+                                    </fo:table-cell>
+                                 </fo:table-row>
+
+                                 <fo:table-row>
+                                    <fo:table-cell number-columns-spanned="7" border="0.5pt solid black">
+                                       <fo:block text-align="center" font-size="8pt" line-height="0.5cm" vertical-align="middle">DESIGNATION DES PROPRIETES</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell number-columns-spanned="5" border="0.5pt solid black" border-left="hidden">
+                                       <fo:block text-align="center" font-size="8pt" line-height="0.5cm" vertical-align="middle">IDENTIFICATION DU LOCAL</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell number-columns-spanned="14" border="0.5pt solid black" border-left="hidden">
+                                       <fo:block text-align="center" font-size="8pt" line-height="0.5cm" vertical-align="middle">EVALUATION DU LOCAL</fo:block>
+                                    </fo:table-cell>
+                                 </fo:table-row>
+
+<!-- Affichage des titres des colonnes des propri�t�s baties -->
+                                 <fo:table-row>
+                                    <fo:table-cell border="0.5pt solid black">
+                                      <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">AN</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">SECTION</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">N�PLAN</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">CP</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">N� Voirie</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">ADRESSE</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black" border-left="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">CODE RIVOLI</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">BAT</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">ENT</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">NIV</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">N�PORTE</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">N�INVAR</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">S TAR</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">M EVAL</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">AF</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">NAT LOC</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">CAT</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">REVENU CADASTRAL</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">COLL</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">NAT EXO</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">AN RET</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">AN DEB</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">FRACTION RC EXO</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">% EXO</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">TX OM</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">COEF</fo:block>
+                                    </fo:table-cell>
+                                 </fo:table-row>
+                              </fo:table-header>
+
+                              <fo:table-footer>
+                                 <fo:table-row>
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+                                 </fo:table-row>
+                              </fo:table-footer>
+
+<!-- Affichage des donn�es des propri�t�s baties -->
+                              <fo:table-body>
+                                 <fo:table-row>
+                                    <fo:table-cell>
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+                                 </fo:table-row>
+
+                                 <xsl:for-each select="Mj/Mj_Compte_Communal/Mj_Bati | Mj/Mj_Compte_Communal_Parcelle/Mj_Bati">
+								 <xsl:sort select="@section" />
+									<xsl:sort select="@num_plan" data-type="number"/>
+                                    <fo:table-row>
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@date" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell padding-right="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="right" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@section" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@num_plan" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@cp" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@voirie" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell padding-left="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@adresse" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-left="hidden" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@code_rivoli" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@bat" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@ent" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@niv" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@num_de_porte" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell padding-left="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@num_invar" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+<!--Affichage du PEV lorsqu'il n'y en a qu'un (m�me ligne) -->
+                                       <xsl:if test="count(Mj_Pev) = 1">
+                                          <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="@s_tar" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="@m_eva" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="@af" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="@nat_loc" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="@cat" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell padding-right="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="right" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="@revenu_cadastral" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="Mj_Pev/Mj_Exone_Pev/@coll" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell padding-right="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="Mj_Pev/@nat_exo" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="Mj_Pev/Mj_Exone_Pev/@an_ret" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="right" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="Mj_Pev/Mj_Exone_Pev/@fraction_rc_exo" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="Mj_Pev/Mj_Exone_Pev/@pourc_exo" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="@tx_om" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             </fo:block>
+                                          </fo:table-cell>
+                                       </xsl:if>
+
+<!--Affichage du premier PEV lorsqu'il y en a plusieurs (m�me ligne) -->
+                                       <xsl:if test="count(Mj_Pev) &gt; 1">
+                                          <xsl:for-each select="Mj_Pev">
+                                             <xsl:if test="position()=1">
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                      <xsl:value-of select="@s_tar" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                      <xsl:value-of select="../@m_eva" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                      <xsl:value-of select="@af" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                      <xsl:value-of select="../@nat_loc" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                      <xsl:value-of select="@cat" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell padding-right="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="right" vertical-align="middle" line-height="0.5cm">
+                                                      <xsl:value-of select="@revenu_cadastral" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                      <xsl:value-of select="@nat_exo" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+                                             </xsl:if>
+                                          </xsl:for-each>
+                                       </xsl:if>
+                                    </fo:table-row>
+
+<!--Affichage des PEV suivants (lignes suivantes) -->
+                                    <xsl:if test="count(Mj_Pev) &gt; 1">
+                                       <xsl:for-each select="Mj_Pev">
+                                          <xsl:if test="position()&gt;1">
+                                             <fo:table-row>
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                      <xsl:value-of select="@s_tar" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                      <xsl:value-of select="../@m_eva" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                      <xsl:value-of select="@af" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                      <xsl:value-of select="../@nat_loc" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                      <xsl:value-of select="@cat" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell padding-right="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="right" vertical-align="middle" line-height="0.25cm">
+                                                      <xsl:value-of select="@revenu_cadastral" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                      <xsl:value-of select="@nat_exo" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+                                             </fo:table-row>
+
+                                             <fo:table-row>
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell padding-right="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="right" vertical-align="middle" line-height="0.25cm">
+                                                      <xsl:value-of select="../@revenu_cadastral" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                      <xsl:value-of select="../@tx_om" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+                                             </fo:table-row>
+                                          </xsl:if>
+                                       </xsl:for-each>
+                                    </xsl:if>
+
+<!--Affichage des Lot_Local s'il y en a -->
+                                    <xsl:if test="count(Mj_Lot_Local) &gt; 0">
+                                       <xsl:for-each select="Mj_Lot_Local">
+                                          <fo:table-row>
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell padding-left="0.4cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block vertical-align="middle" line-height="0.25cm">
+                                                   <xsl:value-of select="@lot" />
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell padding-right="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="right" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+                                          </fo:table-row>
+                                       </xsl:for-each>
+                                    </xsl:if>
+                                 </xsl:for-each>
+                              </fo:table-body>
+                           </fo:table>
+                        </fo:table-cell>
+                     </fo:table-row>
+
+<!-- Affichage du pied du tableau des proprietes baties -->
+                     <fo:table-row>
+                        <fo:table-cell>
+                           <fo:block keep-together="always" keep-with-previous="always">
+                              <fo:table table-layout="fixed" border-collapse="collapse" width="28.7cm" border-color="black" border-right="0.5pt" border-left="0.5pt" border-top="0pt" border-bottom="0.5pt" border-style="solid" font-size="6pt" padding-top="0.2cm" padding-bottom="0.1cm">
+                                 <fo:table-column column-width="1.8cm" />
+
+                                 <fo:table-column column-width="2cm" />
+
+                                 <fo:table-column column-width="2.5cm" />
+
+                                 <fo:table-column column-width="1.5cm" />
+
+                                 <fo:table-column column-width="2cm" />
+
+                                 <fo:table-column column-width="2.5cm" />
+
+                                 <fo:table-column column-width="1.5cm" />
+
+                                 <fo:table-column column-width="2cm" />
+
+                                 <fo:table-column column-width="2.5cm" />
+
+                                 <fo:table-column column-width="1.5cm" />
+
+                                 <fo:table-column column-width="2cm" />
+
+                                 <fo:table-column column-width="6.9cm" />
+
+                                 <fo:table-body>
+                                    <xsl:for-each select="Mj/Mj_Compte_Communal | Mj/Mj_Compte_Communal_Parcelle">
+                                       <fo:table-row>
+										  <fo:table-cell number-columns-spanned="4">
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">R EXO</fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">
+                                             <xsl:value-of select="@exo_com_bati" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+
+										  <fo:table-cell number-columns-spanned="2">
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">R EXO</fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">
+                                             <xsl:value-of select="@exo_dep_bati" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+
+										  <fo:table-cell number-columns-spanned="2">
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">R EXO</fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">
+                                             <xsl:value-of select="@exo_reg_bati" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+                                       </fo:table-row>
+
+                                       <fo:table-row>
+                                          <fo:table-cell>
+                                             <fo:block text-align="left" line-height="0.60cm" vertical-align="middle">REV IMPOSABLE</fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.60cm" vertical-align="middle">
+                                             <xsl:value-of select="@rev_impo_bati" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.60cm" vertical-align="middle">COM</fo:block>
+                                          </fo:table-cell>
+
+										  <fo:table-cell number-columns-spanned="3">
+                                             <fo:block text-align="right" line-height="0.60cm" vertical-align="middle">DEP</fo:block>
+                                          </fo:table-cell>
+
+										  <fo:table-cell number-columns-spanned="3">
+                                             <fo:block text-align="right" line-height="0.60cm" vertical-align="middle">R</fo:block>
+                                          </fo:table-cell>
+                                       </fo:table-row>
+
+                                       <fo:table-row>
+										  <fo:table-cell number-columns-spanned="4">
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">R IMP</fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">
+                                             <xsl:value-of select="@rev_impo_com_bati" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+
+										  <fo:table-cell number-columns-spanned="2">
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">R IMP</fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">
+                                             <xsl:value-of select="@rev_impo_dep_bati" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+
+										  <fo:table-cell number-columns-spanned="2">
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">R IMP</fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">
+                                             <xsl:value-of select="@rev_impo_reg_bati" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+                                       </fo:table-row>
+                                    </xsl:for-each>
+                                 </fo:table-body>
+                              </fo:table>
+                           </fo:block>
+                        </fo:table-cell>
+                     </fo:table-row>
+
+<!-- Affichage des proprietes non baties -->
+                     <fo:table-row>
+                        <fo:table-cell>
+                           <fo:table table-layout="fixed" width="100%" border-collapse="collapse" font-size="7pt">
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="1.5cm" />
+
+                              <fo:table-column column-width="1.2cm" />
+
+                              <fo:table-column column-width="1.2cm" />
+
+                              <fo:table-column column-width="5.8cm" />
+
+                              <fo:table-column column-width="0.9cm" />
+
+                              <fo:table-column column-width="1.4cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="0.9cm" />
+
+                              <fo:table-column column-width="1.1cm" />
+
+                              <fo:table-column column-width="1cm" />
+
+                              <fo:table-column column-width="0.9cm" />
+
+                              <fo:table-column column-width="0.7cm" />
+
+                              <fo:table-column column-width="0.7cm" />
+
+                              <fo:table-column column-width="0.7cm" />
+
+                              <fo:table-column column-width="2cm" />
+
+                              <fo:table-column column-width="0.9cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="1.5cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+<!-- Affichage de l'en-t�te des proprietes non baties -->
+                              <fo:table-header>
+                                 <fo:table-row>
+                                    <fo:table-cell number-columns-spanned="23" padding-top="1cm" padding-bottom="0.1cm">
+                                       <fo:block text-align="center" font-size="8pt" line-height="0.5cm" vertical-align="middle">PROPRIETES NON BATIES</fo:block>
+                                    </fo:table-cell>
+                                 </fo:table-row>
+
+                                 <fo:table-row>
+                                    <fo:table-cell number-columns-spanned="6" border="0.5pt solid black">
+                                       <fo:block text-align="center" font-size="8pt" line-height="0.5cm" vertical-align="middle">DESIGNATION DES PROPRIETES</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell number-columns-spanned="17" border="0.5pt solid black" border-left="hidden">
+                                       <fo:block text-align="center" font-size="8pt" line-height="0.5cm" vertical-align="middle">EVALUATION</fo:block>
+                                    </fo:table-cell>
+                                 </fo:table-row>
+
+<!-- Affichage des titres des colonnes des proprietes non baties -->
+                                 <fo:table-row>
+                                    <fo:table-cell border="0.5pt solid black">
+                                      <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">AN</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">SECTION</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">N�PLAN</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">N� Voirie</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">ADRESSE</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black" border-left="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">CODE RIVOLI</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">N�PARC PRIM</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black" border-left="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">FP DP</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black" border-left="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">S TAR</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">SUF</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">GR/SS GR</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">CLASSE</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">NAT CULT</fo:block>
+                                    </fo:table-cell>
+
+<!-- Creation d'une table pour afficher le titre de colonne (CONTENANCE HA A CA) -->
+                                    <fo:table-cell number-columns-spanned="3" border="0.5pt solid black">
+                                       <fo:table table-layout="fixed" border-collapse="collapse" font-size="6pt" width="100%">
+                                          <fo:table-body>
+                                             <fo:table-row>
+                                                <fo:table-cell number-columns-spanned="3" padding-top="0.05cm">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">CONTENANCE</fo:block>
+                                                </fo:table-cell>
+                                             </fo:table-row>
+
+                                             <fo:table-row>
+                                                <fo:table-cell>
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">HA</fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell>
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">A</fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell>
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">CA</fo:block>
+                                                </fo:table-cell>
+                                             </fo:table-row>
+                                          </fo:table-body>
+                                       </fo:table>
+                                    </fo:table-cell>
+
+<!-- Suite de l'affichage des titres des colonnes des proprietes non baties -->
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">REVENU CADASTRAL</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">COLL</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">NAT EXO</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">AN RET</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">FRACTION RC EXO</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">% EXO</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">POS</fo:block>
+                                    </fo:table-cell>
+                                 </fo:table-row>
+                              </fo:table-header>
+
+                              <fo:table-footer>
+                                 <fo:table-row>
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell number-columns-spanned="3" border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+                                 </fo:table-row>
+                              </fo:table-footer>
+
+<!-- Affichage des donnees des proprietes non baties -->
+							<fo:table-body>
+								<fo:table-row>
+									<fo:table-cell>
+										<fo:block></fo:block>
+									</fo:table-cell>
+								</fo:table-row>
+
+								<xsl:for-each select="Mj/Mj_Compte_Communal/Mj_Parcelle | Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle">
+									<xsl:sort select="@section" />
+									<xsl:sort select="@num_plan" data-type="number"/>
+									<fo:table-row>
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@date" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell padding-right="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="right" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@section" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@num_plan" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@num_voirie" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell padding-left="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@adresse" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell padding-left="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@code_rivoli" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@num_parc_prim" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@fp_dp" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@s_tar" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@suf" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@grss_gr" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@clas" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@nat_cult" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@ha" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@a" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@ca" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+<!-- Affichage de la colonne revenu cadastral lorsqu'il a une seule suf -->
+                                       <xsl:if test="count(Mj_Suf)=1">
+                                          <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="@revenu_cadastral" />
+                                             </fo:block>
+                                          </fo:table-cell>
+                                       </xsl:if>
+
+<!-- Affichage de la colonne revenu cadastral lorsqu'il a plusieurs sufs -->
+                                       <xsl:if test="count(Mj_Suf) &gt; 1">
+                                          <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             </fo:block>
+                                          </fo:table-cell>
+                                       </xsl:if>
+
+<!-- Suite de l'affichage des donnees des proprietes non baties -->
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="Mj_Suf/@nat_exo" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                          </fo:block>
+                                       </fo:table-cell>
+                                    </fo:table-row>
+
+<!-- Affichage des Suf lorsqu'il y en a plusieurs -->
+                                    <xsl:if test="count(Mj_Suf) &gt; 1">
+                                       <xsl:for-each select="Mj_Suf">
+                                          <fo:table-row>
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                   <xsl:value-of select="@s_tar" />
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                   <xsl:value-of select="@suf" />
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                   <xsl:value-of select="@grss_gr" />
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                   <xsl:value-of select="@clas" />
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                   <xsl:value-of select="@nat_cult" />
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                   <xsl:value-of select="@ha" />
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                   <xsl:value-of select="@a" />
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                   <xsl:value-of select="@ca" />
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                   <xsl:value-of select="@revenu_cadastral" />
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                   <xsl:value-of select="@nat_exo" />
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+                                          </fo:table-row>
+                                       </xsl:for-each>
+									</xsl:if>
+								</xsl:for-each>
+                              </fo:table-body>
+                           </fo:table>
+                        </fo:table-cell>
+                     </fo:table-row>
+
+<!-- Affichage du pied du tableau des proprietes non baties -->
+                     <fo:table-row>
+                        <fo:table-cell>
+                           <fo:block keep-together="always" keep-with-previous="always">
+                              <fo:table width="26.6cm" table-layout="fixed" border-color="black" border-right="0.5pt" border-left="0.5pt" border-top="0pt" border-bottom="0.5pt" border-style="solid" border-collapse="collapse" font-size="6pt" padding-top="0.2cm" padding-bottom="0.1cm">
+                                 <fo:table-column column-width="1cm" />
+                                 <fo:table-column column-width="1cm" />
+                                 <fo:table-column column-width="1cm" />
+                                 <fo:table-column column-width="1cm" />
+                                 <fo:table-column column-width="1.8cm" />
+                                 <fo:table-column column-width="2cm" />
+                                 <fo:table-column column-width="2cm" />
+                                 <fo:table-column column-width="1.5cm" />
+                                 <fo:table-column column-width="2cm" />
+                                 <fo:table-column column-width="2cm" />
+                                 <fo:table-column column-width="1.5cm" />
+                                 <fo:table-column column-width="2cm" />
+                                 <fo:table-column column-width="2cm" />
+                                 <fo:table-column column-width="1.5cm" />
+                                 <fo:table-column column-width="2cm" />
+                                 <fo:table-column column-width="2.3cm" />
+                                 <fo:table-body>
+                                    <xsl:for-each select="Mj/Mj_Compte_Communal | Mj/Mj_Compte_Communal_Parcelle">
+                                       <fo:table-row>
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="center" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">HA</fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="center" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">A</fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="center" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">CA</fo:block>
+                                          </fo:table-cell>
+										  <fo:table-cell number-columns-spanned="4">
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">R EXO</fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">
+                                             <xsl:value-of select="@exo_com_par" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+										  <fo:table-cell number-columns-spanned="2">
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">R EXO</fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">
+                                             <xsl:value-of select="@exo_dep_par" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+										  <fo:table-cell number-columns-spanned="2">
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">R EXO</fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">
+                                             <xsl:value-of select="@exo_reg_par" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+                                       </fo:table-row>
+                                       <fo:table-row>
+                                          <fo:table-cell>
+                                             <fo:block text-align="left" line-height="0.60cm" vertical-align="middle">CONT</fo:block>
+                                          </fo:table-cell>
+										  <fo:table-cell number-columns-spanned="4">
+                                             <fo:block text-align="right" line-height="0.60cm" vertical-align="middle">REV IMPOSABLE</fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.60cm" vertical-align="middle">
+                                             <xsl:value-of select="@rev_impo_par" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.60cm" vertical-align="middle">COM</fo:block>
+                                          </fo:table-cell>
+										  <fo:table-cell number-columns-spanned="3">
+                                             <fo:block text-align="right" line-height="0.60cm" vertical-align="middle">DEP</fo:block>
+                                          </fo:table-cell>
+										  <fo:table-cell number-columns-spanned="3">
+                                             <fo:block text-align="right" line-height="0.60cm" vertical-align="middle">R</fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell number-columns-spanned="3" padding-right="0.8cm">
+                                             <fo:block text-align="right" line-height="0.60cm" vertical-align="middle">MAJ POS</fo:block>
+                                          </fo:table-cell>
+                                       </fo:table-row>
+                                       <fo:table-row>
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle">
+                                             </fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="center" line-height="0.20cm" vertical-align="middle">
+                                                <xsl:value-of select="@ha" />
+                                             </fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="center" line-height="0.20cm" vertical-align="middle">
+                                                <xsl:value-of select="@a" />
+                                             </fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="center" line-height="0.20cm" vertical-align="middle">
+                                                <xsl:value-of select="@ca" />
+                                             </fo:block>
+                                          </fo:table-cell>
+										  <fo:table-cell number-columns-spanned="4">
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle">R IMP</fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle">
+                                             <xsl:value-of select="@rev_impo_com_par" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+										  <fo:table-cell number-columns-spanned="2">
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle">R IMP</fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle">
+                                             <xsl:value-of select="@rev_impo_dep_par" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+										  <fo:table-cell number-columns-spanned="2">
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle">R IMP</fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle">
+                                             <xsl:value-of select="@rev_impo_reg_par" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+                                       </fo:table-row>
+                                    </xsl:for-each>
+                                 </fo:table-body>
+
+<!-- Fin de la table du pied du tableau des propi�t�s non baties -->
+                              </fo:table>
+                           </fo:block>
+                        </fo:table-cell>
+                     </fo:table-row>
+
+<!-- Fin du corps du tableau global -->
+                  </fo:table-body>
+
+<!-- Fin du tableau global -->
+               </fo:table>
+
+               <fo:block id="theEnd" />
+            </fo:flow>
+         </fo:page-sequence>
+      </fo:root>
+   </xsl:template>
+</xsl:stylesheet>
+
diff --git a/src/module_cadastre/web_service/class/majic_lib/xsl/RP.xslt b/src/module_cadastre/web_service/class/majic_lib/xsl/RP.xslt
new file mode 100755
index 0000000000000000000000000000000000000000..0dae5920b7c5ea243e24c24766bed273d10c901b
--- /dev/null
+++ b/src/module_cadastre/web_service/class/majic_lib/xsl/RP.xslt
@@ -0,0 +1,3036 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE xsl:stylesheet [
+  <!ENTITY nbsp "&#160;">
+]>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  <xsl:output method="html" encoding="utf-8" doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
+  <xsl:template match="/">
+    <xsl:param name="poste"/>
+    <xsl:param name="type"/>
+
+    <html xmlns="http://www.w3.org/1999/xhtml"
+      lang="fr"
+      >
+      <body>
+        <table  table-layout="fixed" width="100%" CELLSPACING="0" CELLPADDING="0">
+          
+          <!-- Début de l'en-tête qui se retrouvera sur chaque page du RP -->
+          
+          <thead>
+            <tr> 
+              <td width="100%">
+                
+                <table style="text-align: center; font-size: 10pt;line-height: 0.8cm;" width="100%" CELLSPACING="0" CELLPADDING="1" >
+                  <tbody>
+                    <xsl:for-each select="Mj/Mj_Compte_Communal | Mj/Mj_Compte_Communal_Parcelle">
+                      <tr>
+                        <td  style="border-width: 0.5pt; border-style: solid; border-color: black; border-right: hidden;" width="4.14%">
+                          <div style="vertical-align: middle; line-height: 0.3cm; text-align: center;">ANNEE DE MAJ</div>
+                        </td>
+                        <td style="border-width: 0.5pt; border-style: solid; border-color: black; border-right: hidden;" width="2.07%">
+                          <div style="vertical-align: middle; line-height: 0.6cm; text-align: center;">
+                            <xsl:value-of select="@annee_de_maj"/>
+                          </div>
+                        </td>
+                        <td style="border-width: 0.5pt; border-style: solid; border-color: black; border-right: hidden;" width="2.07%">
+                          <div style="vertical-align: middle; line-height: 0.3cm; text-align: center;">DEP DIR</div>
+                        </td>                       
+                        <td style="border-width: 0.5pt; border-style: solid; border-color: black; border-right: hidden;" width="3.11%">
+                          <div style="vertical-align: middle; line-height: 0.6cm; text-align: center;">
+                            <xsl:value-of select="@dep_dir"/>
+                          </div>
+                        </td>                        
+                        <td style="border-width: 0.5pt; border-style: solid; border-color: black; border-right: hidden;" whidth="3.11%">
+                          <div style="vertical-align: middle; line-height: 0.6cm; text-align: center;">COM</div>
+                        </td>
+                        <td style="border-width: 0.5pt; border-style: solid; border-color: black;" whidth="22.08%">
+                          <div style="vertical-align: middle; line-height: 0.6cm; text-align: center;">
+                            <xsl:value-of select="@com"/>
+                          </div>
+                        </td>
+                        <td whidth="53.13%">
+                          <div style="font-style: italic; font-size: 16pt; vertical-align: middle; line-height: 0.5cm; text-align: center;">
+                            RELEVE DE PROPRIETE
+                          </div>
+                        </td>                        
+                        <td style="border-width: 0.5pt; border-style: solid; border-color: black; border-right: hidden;" whidth="6.21%">
+                          <div style="vertical-align: middle; line-height: 0.3cm; text-align: center;">NUMERO COMMUNAL</div>
+                        </td>                      
+                        <td style="border-width: 0.5pt; border-style: solid; border-color: black;" whidth="3.11%">
+                          <div style="vertical-align: middle; line-height: 0.6cm; text-align: center;">
+                            <xsl:value-of select="substring(@numero_communal,6)"/>
+                          </div>
+                        </td>
+                      </tr>
+                    </xsl:for-each>
+                  </tbody>
+                </table>
+              </td>
+            </tr>
+            <!-- Affichage de la ligne titre "PROPRIETAIRE" -->
+            <tr>             
+              <td width="100%"> 
+                <table style="text-align: center;" width="100%">
+                  <tbody> 
+                    <tr>
+                      <td padding-top="0.5cm" padding-bottom="0.1cm">
+                        <div style="font-size: 10pt; text-align: center;">PROPRIETAIRE</div>
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </td>
+            </tr>
+            <!-- Affichage du tableau proprietaire -->
+            
+            <tr>
+              
+              <td>
+                
+                <table style="text-align: left; table-layout: fixed; border-color: black; border: 0.5pt; border-style: solid; border-collapse: collapse; font-size: 10pt; padding-top: 0.2cm; padding-bottom: 0.1cm;" width="100%" >                 
+                  
+                  
+                  <tbody>
+                    
+                    <xsl:for-each select="Mj/Mj_Compte_Communal/Mj_Proprietaire | Mj/Mj_Compte_Communal_Parcelle/Mj_Proprietaire">
+                      
+                      <tr>
+                        <xsl:if test="$type='complet'">
+                          <td width="75%" style="padding-left: 0.3cm;">
+                            <div>
+                              <xsl:value-of select="@l_ccodro"/>&nbsp;<xsl:value-of select="@l_ccodem"/>&nbsp;<xsl:value-of select="@dnuper"/>&nbsp;<xsl:value-of select="@proprietaire_nom"/>
+                            </div>
+                          </td>
+
+                          <td width="25%" style="padding-left: 0.3cm;">
+                            <div>
+                              <xsl:value-of select="@jdatnss"/>
+                            </div>
+                          </td>
+                        </xsl:if>
+                        <xsl:if test="not($type='complet')">
+                          <td width="100%" style="padding-left: 0.3cm;">
+                            <div>
+                              <xsl:value-of select="@l_ccodro"/>&nbsp;<xsl:value-of select="@l_ccodem"/>&nbsp;<xsl:value-of select="@dnuper"/>&nbsp;<xsl:value-of select="@proprietaire_nom_tiers"/>
+                            </div>
+                          </td>
+                        </xsl:if>
+                      </tr>
+                      
+                      <tr>
+                        <td style="padding-left: 0.3cm;">
+                          <div>
+                            <xsl:value-of select="@proprietaire_adresse"/>
+                          </div>
+                        </td>
+                        <xsl:if test="$type='complet'">
+                          <td>
+                            <div>
+                              <xsl:value-of select="@dldnss"/>
+                            </div>
+                          </td>
+                        </xsl:if>
+                      </tr>
+                    </xsl:for-each>
+                  </tbody>
+                </table>
+              </td>
+            </tr>
+          </thead>
+          <!-- Fin de l'en-tête -->
+          <!-- Début du corps du tableau global -->
+          
+          <tbody>
+            <!-- Affichage des poprietes baties -->
+            
+            <tr>
+
+              <td width="100%">
+                
+                <table width="100%" style="text-align: center; font-size: 10pt;" CELLSPACING="0" CELLPADDING="0"  >
+                  
+                  <!-- Affichage de l'en-tête des propriétés baties -->
+                  
+                  <thead width="100%">
+                    
+                    <tr >
+                      <xsl:if test="$type='complet'">
+                        <td style="text-align: center; border-color: black; border-style: solid; border-left: hidden; border-right: hidden; border-top: hidden; border-bottom: hidden; border-width: 0.5pt; padding-top: 1cm; padding-bottom: 0.1cm;" valign="top" colspan="26" >
+                          <div style ="text-align: center; font-size: 8pt; line-height: 0.5cm; vertical-align: middle;" >PROPRIETES BATIES</div>
+                        </td>
+                      </xsl:if>
+                      <xsl:if test="not($type='complet')">
+                        <td style="text-align: center; border-color: black; border-style: solid; border-left: hidden; border-right: hidden; border-top: hidden; border-bottom: hidden; border-width: 0.5pt; padding-top: 1cm; padding-bottom: 0.1cm;" valign="top" colspan="20" >
+                          <div style ="text-align: center; font-size: 8pt; line-height: 0.5cm; vertical-align: middle;" >PROPRIETES BATIES</div>
+                        </td>
+                      </xsl:if>
+                    </tr>
+                    
+                    <tr>
+                      
+                      <td style="border-color: black; border-style: solid; border-right: hidden; border-bottom: hidden; border-width: 0.5pt;" valign="top" colspan="7">
+                        <div style ="text-align: center; font-size: 8pt; line-height: 0.5cm; vertical-align: middle;" >DESIGNATION DES PROPRIETES</div>
+                      </td>
+                      
+                      <td style="border-color: black; border-style: solid; border-left: hidden; border-bottom: hidden; border-right: hidden; border-width: 0.5pt;" valign="top" colspan="5">
+                        <div style ="text-align: center; font-size: 8pt; line-height: 0.5cm; vertical-align: middle;" >IDENTIFICATION DU LOCAL</div>
+                      </td>
+                      <xsl:if test="$type='complet'">
+                        <td style="border-color: black; border-style: solid; border-left: hidden; border-bottom: hidden; border-width: 0.5pt;" valign="top" colspan="14">
+                          <div style ="text-align: center; font-size: 8pt; line-height: 0.5cm; vertical-align: middle;" >EVALUATION DU LOCAL</div>
+                        </td>
+                      </xsl:if>
+                      <xsl:if test="not($type='complet')">
+                        <td style="border-color: black; border-style: solid; border-left: hidden; border-bottom: hidden; border-width: 0.5pt;" valign="top" colspan="8">
+                          <div style ="text-align: center; font-size: 8pt; line-height: 0.5cm; vertical-align: middle;" >EVALUATION DU LOCAL</div>
+                        </td>
+                      </xsl:if>
+                    </tr>
+                    
+                    <!-- Affichage des titres des colonnes des propriétés baties -->
+                    
+                    <tr>
+
+                      <td width="2.07%" style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden;" valign="top">
+                        <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">AN</div>
+                      </td>
+                      
+                      <td width="4.14%" style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden;" valign="top">
+                        <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">SECTION</div>
+                      </td>
+
+                      <td width="3.45%" style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden;" valign="top">
+                        <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">N°PLAN</div>
+                      </td>
+
+                      <td width="1.38%" style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden;" valign="top">
+                        <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">CP</div>
+                      </td>
+
+                      <td width="4.14%" style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden;" valign="top">
+                        <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">N° Voirie</div>
+                      </td>
+
+                      <xsl:if test="$type='complet'">
+                        <td width="22.08%" style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden;" valign="top">
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">ADRESSE</div>
+                        </td>
+                      </xsl:if>
+                      <xsl:if test="not($type='complet')">
+                        <td width="38.99%" style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden;" valign="top">
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">ADRESSE</div>
+                        </td>
+                      </xsl:if>
+
+                      <td width="3.11%" style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-left: hidden;" valign="top">
+                        <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">CODE RIVOLI</div>
+                      </td>
+
+                      <td width="2.07%" style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden;" valign="top">
+                        <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">BAT</div>
+                      </td>
+
+                      <td width="2.07%" style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden;" valign="top">
+                        <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">ENT</div>
+                      </td>
+
+                      <td width="2.07%" style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden;" valign="top">
+                        <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">NIV</div>
+                      </td>
+
+                      <td width="4.14%" style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden;" valign="top">
+                        <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">N°PORTE</div>
+                      </td>
+
+                      <td width="6.21%" style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden;" valign="top">
+                        <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">N°INVAR</div>
+                      </td>
+
+                      <td width="2.42%" style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden;" valign="top">
+                        <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">S TAR</div>
+                      </td>
+
+                      <td width="2.42%" style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden;" valign="top">
+                        <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">M EVAL</div>
+                      </td>
+
+                      <td width="1.38%" style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden;" valign="top">
+                        <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">AF</div>
+                      </td>
+
+                      <td width="4.14%" style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden;" valign="top">
+                        <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">NAT LOC</div>
+                      </td>
+
+                      <td width="2.07%" style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden;" valign="top">
+                        <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">CAT</div>
+                      </td>
+
+                      <td width="8.28%" style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden;" valign="top">
+                        <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">REVENU CADASTRAL</div>
+                      </td>
+
+                      <xsl:if test="$type='complet'">
+                        <td width="2.42%" style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden;" valign="top">
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">COLL</div>
+                        </td>
+
+                        <td width="2.07%" style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden;" valign="top">
+                          <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">NAT EXO</div>
+                        </td>
+
+                        <td width="2.07%" style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden;" valign="top">
+                          <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">AN RET</div>
+                        </td>
+
+                        <td width="2.07%" style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden;" valign="top">
+                          <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">AN DEB</div>
+                        </td>
+
+                        <td width="6.21%" style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden;" valign="top">
+                          <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">FRACTION RC EXO</div>
+                        </td>
+
+                        <td width="2.07%" style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden;" valign="top">
+                          <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">% EXO</div>
+                        </td>
+                      </xsl:if>
+
+                      <td width="2.07%" style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden;" valign="top">
+                        <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">TX OM</div>
+                      </td>
+
+                      <td width="2.42%" style="border-style: solid; border-width: 0.5pt; border-color: black;" valign="top">
+                        <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">COEF</div>
+                      </td>
+                    </tr>
+                  </thead>
+                  
+                  <tfoot>
+                    
+                    <tr>
+
+                      <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-left: hidden;" valign="top">
+                        <div>
+                        </div>
+                      </td>
+                      
+                      <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-left: hidden;" valign="top">
+                        <div>
+                        </div>
+                      </td>
+                      
+                      <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-left: hidden;" valign="top">
+                        <div>
+                        </div>
+                      </td>
+                      
+                      <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-left: hidden;" valign="top">
+                        <div>
+                        </div>
+                      </td>
+                      
+                      <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-left: hidden;" valign="top">
+                        <div>
+                        </div>
+                      </td>
+                      
+                      <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-left: hidden;" valign="top">
+                        <div>
+                        </div>
+                      </td>
+                      
+                      <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-left: hidden;" valign="top">
+                        <div>
+                        </div>
+                      </td>
+                      
+                      <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-left: hidden;" valign="top">
+                        <div>
+                        </div>
+                      </td>
+                      
+                      <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-left: hidden;" valign="top">
+                        <div>
+                        </div>
+                      </td>
+                      
+                      <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-left: hidden;" valign="top">
+                        <div>
+                        </div>
+                      </td>
+                      
+                      <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-left: hidden;" valign="top">
+                        <div>
+                        </div>
+                      </td>
+                      
+                      <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-left: hidden;" valign="top">
+                        <div>
+                        </div>
+                      </td>
+                      
+                      <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-left: hidden;" valign="top">
+                        <div>
+                        </div>
+                      </td>
+                      
+                      <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-left: hidden;" valign="top">
+                        <div>
+                        </div>
+                      </td>
+                      
+                      <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-left: hidden;" valign="top">
+                        <div>
+                        </div>
+                      </td>
+                      
+                      <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-left: hidden;" valign="top">
+                        <div>
+                        </div>
+                      </td>
+                      
+                      <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-left: hidden;" valign="top">
+                        <div>
+                        </div>
+                      </td>
+                      
+                      <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-left: hidden;" valign="top">
+                        <div>
+                        </div>
+                      </td>
+
+                      <xsl:if test="$type='complet'">
+                        <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-left: hidden;" valign="top">
+                          <div>
+                          </div>
+                        </td>
+
+                        <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-left: hidden;" valign="top">
+                          <div>
+                          </div>
+                        </td>
+
+                        <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-left: hidden;" valign="top">
+                          <div>
+                          </div>
+                        </td>
+
+                        <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-left: hidden;" valign="top">
+                          <div>
+                          </div>
+                        </td>
+
+                        <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-left: hidden;" valign="top">
+                          <div>
+                          </div>
+                        </td>
+
+                        <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-left: hidden;" valign="top">
+                          <div>
+                          </div>
+                        </td>
+                      </xsl:if>
+                        
+                      <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-left: hidden;" valign="top">
+                        <div>
+                        </div>
+                      </td>
+                      
+                      <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-left: hidden;" valign="top">
+                        <div>
+                        </div>
+                      </td>
+                    </tr>
+                  </tfoot>
+                  <!-- Affichage des données des propriétés baties -->
+                  
+                  <tbody>
+                    
+                    <tr>
+                      
+                      <td>
+                        <div>
+                        </div>
+                      </td>
+                    </tr>
+                    
+                    <xsl:for-each select="Mj/Mj_Compte_Communal/Mj_Bati | Mj/Mj_Compte_Communal_Parcelle/Mj_Bati">
+						 <xsl:sort select="substring(@num_invar,1,3)" />
+
+                      <xsl:sort select="@section" />
+						<xsl:sort select="@num_plan" data-type="number"/>
+                      <tr>
+                        
+                        <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                          
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                            <xsl:value-of select="@date"/>
+                          </div>
+                        </td>
+                        
+                        <td style="padding-right: 0.1cm;border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                          
+                          <div text-align="right" vertical-align="middle" line-height="0.5cm">
+                            <xsl:value-of select="@section"/>
+                          </div>
+                        </td>
+                        
+                        <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                          
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                            <xsl:value-of select="@num_plan"/>
+                          </div>
+                        </td>
+                        
+                        <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                          
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                            <xsl:value-of select="@cp"/>
+                          </div>
+                        </td>
+                        
+                        <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                          
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                            <xsl:value-of select="@voirie"/>
+                          </div>
+                        </td>
+                        
+                        <td style="padding-left: 0.1cm; border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                          
+                          <div vertical-align="middle" line-height="0.5cm">
+                            <xsl:value-of select="@adresse"/>
+                          </div>
+                        </td>
+                        
+                        <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden; border-left: hidden;" valign="top">
+                          
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                            <xsl:value-of select="@code_rivoli"/>
+                          </div>
+                        </td>
+                        
+                        <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                          
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                            <xsl:value-of select="@bat"/>
+                          </div>
+                        </td>
+                        
+                        <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden; border-left: hidden;">
+                          
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                            <xsl:value-of select="@ent"/>
+                          </div>
+                        </td>
+                        
+                        <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden; border-left: hidden;">
+                          
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                            <xsl:value-of select="@niv"/>
+                          </div>
+                        </td>
+                        
+                        <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden; border-left: hidden;">
+                          
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                            <xsl:value-of select="@num_de_porte"/>
+                          </div>
+                        </td>
+                        
+                        <td style="padding-left: 0.1cm; border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;">
+                          
+                          <div vertical-align="middle" line-height="0.5cm">
+                            <xsl:value-of select="@num_invar"/>
+                          </div>
+                        </td>
+                        
+                        <!-- Affichage du PEV lorsqu'il n'y en a qu'un (même ligne) -->
+                        
+                        <xsl:if test="count(Mj_Pev) = 1">
+                          
+                          <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                            
+                            <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                              <xsl:value-of select="@s_tar"/>
+                            </div>
+                          </td>
+                          
+                          <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                            
+                            <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                              <xsl:value-of select="@m_eva"/>
+                            </div>
+                          </td>
+                          
+                          <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                            
+                            <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                              <xsl:value-of select="@af"/>
+                            </div>
+                          </td>
+                          
+                          <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                            
+                            <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                              <xsl:value-of select="@nat_loc"/>
+                            </div>
+                          </td>
+                          
+                          <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                            
+                            <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                              <xsl:value-of select="@cat"/>
+                            </div>
+                          </td>
+                          
+                          <td style="padding-right: 0.1cm; border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                            
+                            <div text-align="right" vertical-align="middle" line-height="0.5cm">
+                              <xsl:value-of select="@revenu_cadastral"/>
+                            </div>
+                          </td>
+
+                          <xsl:if test="$type='complet'">
+                            <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+
+                              <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                                
+                              </div>
+                            </td>
+
+                            <td style="padding-right: 0.1cm; border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+
+                              <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                                
+                              </div>
+                            </td>
+
+                            <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+
+                              <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                                
+                              </div>
+                            </td>
+
+                            <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                              <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                              </div>
+                            </td>
+
+                            <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+
+                              <div text-align="right" vertical-align="middle" line-height="0.5cm">
+                               
+                              </div>
+                            </td>
+
+                            <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+
+                              <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                                
+                              </div>
+                            </td>
+                          </xsl:if>
+                          <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                            
+                            <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                              <xsl:value-of select="@tx_om"/>
+                            </div>
+                          </td>
+                          
+                          <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+                            <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                            </div>
+                          </td>
+                        </xsl:if>
+                        
+                        <!--Affichage du premier PEV lorsqu'il y en a plusieurs (même ligne) -->
+                        
+                        <xsl:if test="count(Mj_Pev) > 1">
+                          
+                          <xsl:for-each select="Mj_Pev">
+                            
+                            <xsl:if test="position()=1">
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                                  <xsl:value-of select="@s_tar"/>
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                                  <xsl:value-of select="../@m_eva"/>
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                                  <xsl:value-of select="@af"/>
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                                  <xsl:value-of select="../@nat_loc"/>
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                                  <xsl:value-of select="@cat"/>
+                                </div>
+                              </td>
+                              
+                              <td style="padding-right: 0.1cm; border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div text-align="right" vertical-align="middle" line-height="0.5cm">
+                                  <xsl:value-of select="@revenu_cadastral"/>
+                                </div>
+                              </td>
+
+                              <xsl:if test="$type='complet'">
+                                <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                  <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                                  </div>
+                                </td>
+                              
+                                <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                  <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                                    <xsl:value-of select="@nat_exo"/>
+                                  </div>
+                                </td>
+                              
+                                <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                  <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                                  </div>
+                                </td>
+                              
+                                <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                  <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                                  </div>
+                                </td>
+                              
+                                <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                  <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                                  </div>
+                                </td>
+                              
+                                <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                  <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                                  </div>
+                                </td>
+                              </xsl:if>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                            </xsl:if>
+                          </xsl:for-each>
+                        </xsl:if>
+                      </tr>
+                      <!--Affichage des PEV suivants (lignes suivantes) -->
+                      
+                        
+                        <xsl:for-each select="Mj_Pev">
+                          
+                          <xsl:if test="position()>1">
+                            
+                            <tr>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden; border-left: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden; border-left: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden; border-left: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden; border-left: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                  <xsl:value-of select="@s_tar"/>
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                  <xsl:value-of select="../@m_eva"/>
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                  <xsl:value-of select="@af"/>
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                  <xsl:value-of select="../@nat_loc"/>
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                  <xsl:value-of select="@cat"/>
+                                </div>
+                              </td>
+                              
+                              <td style="padding-right: 0.1cm; border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div text-align="right" vertical-align="middle" line-height="0.3cm">
+                                  <xsl:value-of select="@revenu_cadastral"/>
+                                </div>
+                              </td>
+                              <xsl:if test="$type='complet'">
+                                <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+
+                                  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                  </div>
+                                </td>
+
+                                <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+
+                                  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                    <xsl:value-of select="@nat_exo"/>
+                                  </div>
+                                </td>
+
+                                <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+
+                                  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                  </div>
+                                </td>
+
+                                <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+
+                                  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                  </div>
+                                </td>
+
+                                <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+
+                                  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                  </div>
+                                </td>
+
+                                <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+
+                                  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                  </div>
+                                </td>
+                              </xsl:if>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                            </tr>
+                            
+                            <tr>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden; border-left: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden; border-left: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden; border-left: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden; border-left: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="padding-right: 0.1cm; border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div text-align="right" vertical-align="middle" line-height="0.3cm">
+                                  <xsl:value-of select="../@revenu_cadastral"/>
+                                </div>
+                              </td>
+                              <xsl:if test="$type='complet'">
+                                <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+
+                                  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                  </div>
+                                </td>
+
+                                <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+
+                                  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                  </div>
+                                </td>
+
+                                <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+
+                                  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                  </div>
+                                </td>
+
+                                <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+
+                                  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                  </div>
+                                </td>
+
+                                <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+
+                                  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                  </div>
+                                </td>
+
+                                <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+
+                                  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                  </div>
+                                </td>
+                              </xsl:if>
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                  <xsl:value-of select="../@tx_om"/>
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                            </tr>
+<xsl:if test="count(Mj_Exone_Pev) &gt; 0">
+							 <xsl:for-each select="Mj_Exone_Pev">
+							<tr>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden; border-left: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden; border-left: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden; border-left: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden; border-left: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="padding-right: 0.1cm; border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div text-align="right" vertical-align="middle" line-height="0.3cm">
+                                 
+                                </div>
+                              </td>
+                              <xsl:if test="$type='complet'">
+                                <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+
+                                  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+									 <xsl:value-of select="@coll"/>
+                                  </div>
+                                </td>
+
+                                <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+
+                                  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+								  <xsl:value-of select="@nat_exo"/>
+                                  </div>
+                                </td>
+
+                                <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+
+                                  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+								  <xsl:value-of select="@an_ret"/>
+                                  </div>
+                                </td>
+
+                                <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+
+                                  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+								   <xsl:value-of select="@an_deb"/>
+                                  </div>
+                                </td>
+
+                                <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+
+                                  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+								  <xsl:value-of select="@fraction_rc_exo"/>
+                                  </div>
+                                </td>
+
+                                <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+
+                                  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+									 <xsl:value-of select="@pourc_exo"/>
+                                  </div>
+                                </td>
+                              </xsl:if>
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                  
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                            </tr>
+							</xsl:for-each>
+							</xsl:if>
+                          </xsl:if>
+						  <xsl:if test="position() = 1">
+							<xsl:if test="count(Mj_Exone_Pev) &gt; 0">
+							 <xsl:for-each select="Mj_Exone_Pev">
+							<tr>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden; border-left: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden; border-left: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden; border-left: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden; border-left: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="padding-right: 0.1cm; border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div text-align="right" vertical-align="middle" line-height="0.3cm">
+                                 
+                                </div>
+                              </td>
+                              <xsl:if test="$type='complet'">
+                                <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+
+                                  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+									 <xsl:value-of select="@coll"/>
+                                  </div>
+                                </td>
+
+                                <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+
+                                  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+								  <xsl:value-of select="@nat_exo"/>
+                                  </div>
+                                </td>
+
+                                <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+
+                                  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+								  <xsl:value-of select="@an_ret"/>
+                                  </div>
+                                </td>
+
+                                <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+
+                                  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+								   <xsl:value-of select="@an_deb"/>
+                                  </div>
+                                </td>
+
+                                <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+
+                                  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+								  <xsl:value-of select="@fraction_rc_exo"/>
+                                  </div>
+                                </td>
+
+                                <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+
+                                  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+									 <xsl:value-of select="@pourc_exo"/>
+                                  </div>
+                                </td>
+                              </xsl:if>
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                  
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                            </tr>
+							</xsl:for-each>
+							</xsl:if>
+							</xsl:if>
+                        </xsl:for-each>
+                      <!--Affichage des Lot_Local s'il y en a -->
+                      
+                      <xsl:if test="count(Mj_Lot_Local) > 0">
+                        
+                        <xsl:for-each select="Mj_Lot_Local">
+                          
+                          <tr>
+                            
+                            <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                              <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                              </div>
+                            </td>
+                            
+                            <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                              <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                              </div>
+                            </td>
+                            
+                            <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                              <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                              </div>
+                            </td>
+                            
+                            <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                              <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                              </div>
+                            </td>
+                            
+                            <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                              <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                              </div>
+                            </td>
+                            
+                            <td style="padding-left: 0.4cm; border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                              
+                              <div vertical-align="middle" line-height="0.3cm">
+                                <xsl:value-of select="@lot"/>
+                              </div>
+                            </td>
+                           
+                            <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden; border-left: hidden;" valign="top" >
+                              <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                              </div>
+                            </td>
+                            
+                            <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                              <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                              </div>
+                            </td>
+                            
+                            <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden; border-left: hidden;" valign="top">
+                              <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                              </div>
+                            </td>
+                            
+                            <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden; border-left: hidden;" valign="top">
+                              <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                              </div>
+                            </td>
+                            
+                            <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden; border-left: hidden;" valign="top">
+                              <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                              </div>
+                            </td>
+                            
+                            <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                              <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                              </div>
+                            </td>
+                            
+                            <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                              <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                              </div>
+                            </td>
+                            
+                            <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                              <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                              </div>
+                            </td>
+                            
+                            <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                              <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                              </div>
+                            </td>
+                            
+                            <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                              <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                              </div>
+                            </td>
+                            
+                            <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                              <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                              </div>
+                            </td>
+                            
+                            <td style="padding-right: 0.1cm; border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                              <div text-align="right" vertical-align="middle" line-height="0.3cm">
+                              </div>
+                            </td>
+                            <xsl:if test="$type='complet'">
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                            </xsl:if>
+                            
+                            <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                              <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                              </div>
+                            </td>
+                            
+                            <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+                              <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                              </div>
+                            </td>
+                          </tr>
+                        </xsl:for-each>
+                      </xsl:if>
+                    </xsl:for-each>
+                  </tbody>
+                </table>
+              </td>
+            </tr>
+            
+            <!-- Affichage du pied du tableau des proprietes baties -->
+            
+            <tr>
+              
+              <td>
+                
+                <div keep-together="always" keep-with-previous="always">
+                  
+                  <table  table-layout="fixed" width="100%" style="border-collapse: collapse; border-color: black; border-right: 0.5pt; border-left: 0.5pt; border-top: 0pt; border-bottom: 0.5pt; border-style: solid; font-size: 8pt; padding-top: 0.2cm; padding-bottom: 0.1cm;" >
+                    <td width="6.21%" />
+                    <td width="6.9%" />
+                    <td width="8.63%" />
+                    <td width="5.18%" />
+                    <td width="6.9%" />
+                    <td width="8.63%" />
+                    <td width="5.18%" />
+                    <td width="6.9%" />
+                    <td width="8.63%" />
+                    <td width="5.18%" />
+                    <td width="6.9%" />
+                    <td width="23.81%" />
+                    
+                    <tbody>
+                      
+                      <xsl:for-each select="Mj/Mj_Compte_Communal | Mj/Mj_Compte_Communal_Parcelle">
+                        
+                        <tr>
+                          <xsl:if test="$type='complet'">
+                            <td>
+                              <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                            </td>
+
+                            <td>
+                              <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                            </td>
+
+                            <td>
+                              <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                            </td>
+
+                            <td>
+                              <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;">R EXO</div>
+                            </td>
+
+                            <td>
+
+                              <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;">
+                                <xsl:value-of select="@exo_com_bati_float"/>
+
+
+                                EUR
+                              </div>
+                            </td>
+
+                            <td>
+                              <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                            </td>
+
+                            <td>
+                              <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;">R EXO</div>
+                            </td>
+
+                            <td>
+
+                              <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;">
+                                <xsl:value-of select="@exo_dep_bati_float"/>
+
+
+                                EUR
+                              </div>
+                            </td>
+
+                            <td>
+                              <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                            </td>
+
+                            <td>
+                              <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;">R EXO</div>
+                            </td>
+
+                            <td>
+
+                              <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;">
+                                <xsl:value-of select="@exo_reg_bati_float"/>
+
+
+                                EUR
+                              </div>
+                            </td>
+
+                            <td>
+                              <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                            </td>
+                          </xsl:if>
+                        </tr>
+                        
+                        <tr>
+                          
+                          <td>
+                             <div style="text-align: right; line-height: 0.60cm; vertical-align: middle;">REV IMPOSABLE</div>
+                          </td>
+                          
+                          <td>
+
+                            <div style="text-align: right; line-height: 0.60cm; vertical-align: middle;">
+                              <xsl:value-of select="@rev_impo_bati_float"/>
+
+
+                              EUR
+                            </div>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.60cm; vertical-align: middle;">COM</div>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.60cm; vertical-align: middle;">DEP</div>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.60cm; vertical-align: middle;">R</div>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                          </td>
+                        </tr>
+                        
+                        <tr>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;">R IMP</div>
+                          </td>
+                          
+                          <td>
+
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;">
+                              <xsl:value-of select="@rev_impo_com_bati_float"/>
+
+
+                              EUR
+                            </div>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;">R IMP</div>
+                          </td>
+                          
+                          <td>
+
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;">
+                              <xsl:value-of select="@rev_impo_dep_bati_float"/>
+
+
+                              EUR
+                            </div>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;">R IMP</div>
+                          </td>
+                          
+                          <td>
+
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;">
+                              <xsl:value-of select="@rev_impo_reg_bati_float"/>
+
+
+                              EUR
+                            </div>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                          </td>
+                        </tr>
+                      </xsl:for-each>
+                    </tbody>
+                  </table>
+                </div>
+              </td>
+            </tr>
+            <!-- Affichage des proprietes non baties -->
+            
+            <tr>
+              
+              <td>
+                
+                <table table-layout="fixed" width="100%" style="border-collapse: collapse; font-size: 10pt;" CELLSPACING="0" CELLPADDING="0">
+                  <tr>
+                    <td width="2.07%"/>
+                    <td width="5.18%"/>
+                    <td width="4.14%"/>
+                    <td width="4.14%"/>
+                    <xsl:if test="$type='complet'">
+                      <td width="27.26%"/>
+                    </xsl:if>
+                    <xsl:if test="not($type='complet')">
+                      <td width="41.76%"/>
+                    </xsl:if>
+                    <td width="3.11%"/>
+                    <td width="4.83%"/>
+                    <td width="2.07%"/>
+                    <td width="2.07%"/>
+                    <td width="3.11%"/>
+                    <td width="3.80%"/>
+                    <td width="3.45%"/>
+                    <td width="3.11%"/>
+                    <td width="2.42%"/>
+                    <td width="2.42%"/>
+                    <td width="2.42%"/>
+                    <td width="6.9%0"/>
+                    <xsl:if test="$type='complet'">
+                      <td width="3.11%"/>
+                      <td width="2.07%"/>
+                      <td width="2.07%"/>
+                      <td width="5.18%"/>
+                      <td width="2.07%"/>
+                    </xsl:if>
+                    <td width="2.07%"/>
+                  </tr>
+                  <!-- Affichage de l'en-tête des proprietes non baties -->
+                  
+                  <thead>
+                    
+                    <tr>
+                      <xsl:if test="$type='complet'">
+                        <td colspan="23" style="border-color: black; border-style: solid; border-right: hidden; border-left: hidden; border-top: hidden; border-width: 0.5pt; padding-top: 1cm; padding-bottom: 0.1cm;">
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">PROPRIETES NON BATIES</div>
+                        </td>
+                      </xsl:if>
+                      <xsl:if test="not($type='complet')">
+                        <td colspan="18" style="border-color: black; border-style: solid; border-right: hidden; border-left: hidden; border-top: hidden; border-width: 0.5pt; padding-top: 1cm; padding-bottom: 0.1cm;">
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">PROPRIETES NON BATIES</div>
+                        </td>
+                      </xsl:if>
+                    </tr>
+                    
+                    <tr>
+                      
+                      <td colspan="6" style="border-color: black; border-style: solid; border-right: hidden; border-width: 0.5pt;">
+                        <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">DESIGNATION DES PROPRIETES</div>
+                      </td>
+
+                      <xsl:if test="$type='complet'">
+                        <td colspan="17" style="border-color: black; border-style: solid; border-left: hidden; border-width: 0.5pt;">
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">EVALUATION</div>
+                        </td>
+                      </xsl:if>
+                      <xsl:if test="not($type='complet')">
+                        <td colspan="12" style="border-color: black; border-style: solid; border-left: hidden; border-width: 0.5pt;">
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">EVALUATION</div>
+                        </td>
+                      </xsl:if>
+                    </tr>
+                    
+                    <!-- Affichage des titres des colonnes des proprietes non baties -->
+                    
+                    <tr>
+                      
+                      <td style="border-color: black; border-width: 0.5pt; border-style: solid;">
+                        <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">AN</div>
+                      </td>
+                      
+                      <td style="border-color: black; border-width: 0.5pt; border-style: solid;">
+                        <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">SECTION</div>
+                      </td>
+                      
+                      <td style="border-color: black; border-width: 0.5pt; border-style: solid;">
+                        <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">N°PLAN</div>
+                      </td>
+                      
+                      <td style="border-color: black; border-width: 0.5pt; border-style: solid;">
+                        <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">N° Voirie</div>
+                      </td>
+                      
+                      <td style="border-color: black; border-width: 0.5pt; border-style: solid;">
+                        <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">ADRESSE</div>
+                      </td>
+                      
+                      <td style="border-color: black; border-width: 0.5pt; border-style: solid; border-left: hidden;">
+                        <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">CODE RIVOLI</div>
+                      </td>
+                      
+                      <td style="border-color: black; border-width: 0.5pt; border-style: solid;">
+                        <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">N°PARC PRIM</div>
+                      </td>
+                      
+                      <td style="border-color: black; border-width: 0.5pt; border-style: solid; border-right: hidden; border-left: hidden;">
+                        <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">FP DP</div>
+                      </td>
+                      
+                      <td style="border-color: black; border-width: 0.5pt; border-style: solid; border-left: hidden;">
+                        <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">S TAR</div>
+                      </td>
+                      
+                      <td style="border-color: black; border-width: 0.5pt; border-style: solid;">
+                        <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">SUF</div>
+                      </td>
+                      
+                      <td style="border-color: black; border-width: 0.5pt; border-style: solid;">
+                        <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">GR/SS GR</div>
+                      </td>
+                      
+                      <td style="border-color: black; border-width: 0.5pt; border-style: solid;">
+                        <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">CLASSE</div>
+                      </td>
+                      
+                      <td style="border-color: black; border-width: 0.5pt; border-style: solid;">
+                        <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">NAT CULT</div>
+                      </td>
+                      
+                      <!-- Creation d'une table pour afficher le titre de colonne (CONTENANCE HA A CA) -->
+                      
+                      <td colspan="3" style="border-color: black; border-width: 0.5pt; border-style: solid;">
+                        
+                        <table table-layout="fixed" style="font-size: 8pt; border-collapse: collapse;" width="100%">
+                          <tbody>
+                            
+                            <tr>
+                              <td colspan="3" style="padding-top: 0.05cm;">
+                                <div style="text-align: center; vertical-align: middle; line-height: 0.3cm;">CONTENANCE</div>
+                              </td>
+                            </tr>
+                            
+                            <tr>
+                              
+                              <td width="33%">
+                                <div style="text-align: center; vertical-align: middle; line-height: 0.3cm;">HA</div>
+                              </td>
+                              
+                              <td width="33%">
+                                <div style="text-align: center; vertical-align: middle; line-height: 0.3cm;">A</div>
+                              </td>
+                              
+                              <td width="33%">
+                                <div style="text-align: center; vertical-align: middle; line-height: 0.3cm;">CA</div>
+                              </td>
+                            </tr>
+                          </tbody>
+                        </table>
+                      </td>
+                      
+                      <!-- Suite de l'affichage des titres des colonnes des proprietes non baties -->
+                      
+                      <td style="border-color: black; border-width: 0.5pt; border-style: solid;">
+                        <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">REVENU CADASTRAL</div>
+                      </td>
+
+                      <xsl:if test="$type='complet'">
+                        <td style="border-color: black; border-width: 0.5pt; border-style: solid;">
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">COLL</div>
+                        </td>
+
+                        <td style="border-color: black; border-width: 0.5pt; border-style: solid;">
+                          <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">NAT EXO</div>
+                        </td>
+
+                        <td style="border-color: black; border-width: 0.5pt; border-style: solid;">
+                          <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">AN RET</div>
+                        </td>
+
+                        <td style="border-color: black; border-width: 0.5pt; border-style: solid;">
+                          <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">FRACTION RC EXO</div>
+                        </td>
+
+                        <td style="border-color: black; border-width: 0.5pt; border-style: solid;">
+                          <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">% EXO</div>
+                        </td>
+                      </xsl:if>
+                      
+                      <td style="border-color: black; border-width: 0.5pt; border-style: solid;">
+                        <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">POS</div>
+                      </td>
+                    </tr>
+                  </thead>
+                  
+                  <tfoot>
+                    
+                    <tr>
+                      
+                      <td style="border-color: black; border-width: 0.5pt; border-style: solid; border-right: hidden; border-left: hidden;">
+                        <div>
+                        </div>
+                      </td>
+                      
+                      <td style="border-color: black; border-width: 0.5pt; border-style: solid; border-right: hidden; border-left: hidden;">
+                        <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                        </div>
+                      </td>
+                      
+                      <td style="border-color: black; border-width: 0.5pt; border-style: solid; border-right: hidden; border-left: hidden;">
+                        <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                        </div>
+                      </td>
+                      
+                      <td style="border-color: black; border-width: 0.5pt; border-style: solid; border-right: hidden; border-left: hidden;">
+                        <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                        </div>
+                      </td>
+                      
+                      <td style="border-color: black; border-width: 0.5pt; border-style: solid; border-right: hidden; border-left: hidden;">
+                        <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                        </div>
+                      </td>
+                      
+                      <td style="border-color: black; border-width: 0.5pt; border-style: solid; border-right: hidden; border-left: hidden;">
+                        <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                        </div>
+                      </td>
+                      
+                      <td style="border-color: black; border-width: 0.5pt; border-style: solid; border-right: hidden; border-left: hidden;">
+                        <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                        </div>
+                      </td>
+                      
+                      <td style="border-color: black; border-width: 0.5pt; border-style: solid; border-right: hidden; border-left: hidden;">
+                        <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                        </div>
+                      </td>
+                      
+                      <td style="border-color: black; border-width: 0.5pt; border-style: solid; border-right: hidden; border-left: hidden;">
+                        <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                        </div>
+                      </td>
+                      
+                      <td style="border-color: black; border-width: 0.5pt; border-style: solid; border-right: hidden; border-left: hidden;">
+                        <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                        </div>
+                      </td>
+                      
+                      <td style="border-color: black; border-width: 0.5pt; border-style: solid; border-right: hidden; border-left: hidden;">
+                        <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                        </div>
+                      </td>
+                      
+                      <td style="border-color: black; border-width: 0.5pt; border-style: solid; border-right: hidden; border-left: hidden;">
+                        <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                        </div>
+                      </td>
+                      
+                      <td style="border-color: black; border-width: 0.5pt; border-style: solid; border-right: hidden; border-left: hidden;">
+                        <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                        </div>
+                      </td>
+                      
+                      <td colspan="3" style="border-color: black; border-width: 0.5pt; border-style: solid; border-right: hidden; border-left: hidden;">
+                        <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                        </div>
+                      </td>
+                      
+                      <td style="border-color: black; border-width: 0.5pt; border-style: solid; border-right: hidden; border-left: hidden;">
+                        <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                        </div>
+                      </td>
+
+                      <xsl:if test="$type='complet'">
+                        <td style="border-color: black; border-width: 0.5pt; border-style: solid; border-right: hidden; border-left: hidden;">
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                          </div>
+                        </td>
+
+                        <td style="border-color: black; border-width: 0.5pt; border-style: solid; border-right: hidden; border-left: hidden;">
+                          <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                          </div>
+                        </td>
+
+                        <td style="border-color: black; border-width: 0.5pt; border-style: solid; border-right: hidden; border-left: hidden;">
+                          <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                          </div>
+                        </td>
+
+                        <td style="border-color: black; border-width: 0.5pt; border-style: solid; border-right: hidden; border-left: hidden;">
+                          <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                          </div>
+                        </td>
+
+                        <td style="border-color: black; border-width: 0.5pt; border-style: solid; border-right: hidden; border-left: hidden;">
+                          <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                          </div>
+                        </td>
+                      </xsl:if>
+                      
+                      <td style="border-color: black; border-width: 0.5pt; border-style: solid; border-right: hidden;  border-left: hidden;">
+                        <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                        </div>
+                      </td>
+                    </tr>
+                  </tfoot>
+                  <!-- Affichage des donnees des proprietes non baties -->
+                  
+                  <tbody>
+                    
+                    <tr>
+                      
+                      <td>
+                        <div>
+                        </div>
+                      </td>
+                    </tr>
+                    
+                    <xsl:for-each select="Mj/Mj_Compte_Communal/Mj_Parcelle | Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle">
+						<xsl:sort select="@section" />
+						<xsl:sort select="@num_plan" data-type="number"/>
+                      <tr>
+                        
+                        <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+                          
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                            <xsl:value-of select="@date"/>
+                          </div>
+                        </td>
+                        
+                        <td style="padding-right:0.1cm; border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+                          
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                            <xsl:value-of select="@section"/>
+                          </div>
+                        </td>
+                        
+                        <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+                          
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                            <xsl:value-of select="@num_plan"/>
+                          </div>
+                        </td>
+                        
+                        <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+                          
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                            <xsl:value-of select="@num_voirie"/>
+                          </div>
+                        </td>
+                        
+                        <td style="padding-left:0.1cm; border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+                          
+                          <div vertical-align="middle" line-height="0.5cm">
+                            <xsl:value-of select="@adresse"/>
+                          </div>
+                        </td>
+                        
+                        <td style="padding-left:0.1cm; border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden; border-left: hidden;" valign="top">
+                          
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                            <xsl:value-of select="@code_rivoli"/>
+                          </div>
+                        </td>
+                        
+                        <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+                          
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                            <xsl:value-of select="@num_parc_prim"/>
+                          </div>
+                        </td>
+                        
+                        <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden; border-left: hidden;" valign="top">
+                          
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                            <xsl:value-of select="@fp_dp"/>
+                          </div>
+                        </td>
+                        
+                        <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden; border-left: hidden;" valign="top">
+                          
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                            <xsl:value-of select="@s_tar"/>
+                          </div>
+                        </td>
+                        
+                        <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+                          
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                            <xsl:value-of select="@suf"/>
+                          </div>
+                        </td>
+                        
+                        <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+                          
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                            <xsl:value-of select="@grss_gr"/>
+                          </div>
+                        </td>
+                        
+                        <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+                          
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                            <xsl:value-of select="@clas"/>
+                          </div>
+                        </td>
+                        
+                        <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+                          
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                            <xsl:value-of select="@nat_cult"/>
+                          </div>
+                        </td>
+                        
+                        <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+                          
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                            <xsl:value-of select="@ha"/>
+                          </div>
+                        </td>
+                        
+                        <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden; border-left: hidden;" valign="top">
+                          
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                            <xsl:value-of select="@a"/>
+                          </div>
+                        </td>
+                        
+                        <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden; border-left: hidden;" valign="top">
+                          
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                            <xsl:value-of select="@ca"/>
+                          </div>
+                        </td>
+                        
+                        <!-- Affichage de la colonne revenu cadastral lorsqu'il a une seule suf -->
+                        
+                        <xsl:if test="count(Mj_Suf)=1">
+                          
+                          <td style="padding-right:0.1cm; border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+                            
+                            <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                              <xsl:value-of select="@revenu_cadastral"/>
+                            </div>
+                          </td>
+						   <xsl:if test="$type='complet'">
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                  <xsl:value-of select="Mj_Suf/@nat_exo"/>
+                                </div>
+                              </td>
+
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                            </xsl:if>
+                            <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+                              <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                              </div>
+                            </td>
+                        </xsl:if>
+                        
+                        <!-- Affichage de la colonne revenu cadastral lorsqu'il a plusieurs sufs -->
+                        
+                        <xsl:if test="count(Mj_Suf) > 1">
+                          
+                          <td style="padding-right:0.1cm; border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+                            <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                            </div>
+                          </td>
+						  <xsl:if test="$type='complet'">
+                          <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+                            <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                            </div>
+                          </td>
+
+                          <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+
+                            <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                              <xsl:value-of select="Mj_Suf/@nat_exo"/>
+                            </div>
+                          </td>
+
+                          <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+                            <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                            </div>
+                          </td>
+
+                          <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+                            <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                            </div>
+                          </td>
+
+                          <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+                            <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                            </div>
+                          </td>
+                        </xsl:if>
+                        
+                        <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                          </div>
+                        </td>
+                        </xsl:if>
+                        
+                        <!-- Suite de l'affichage des donnees des proprietes non baties -->
+                        
+                      </tr>
+					
+                      <!-- Affichage des Suf lorsqu'il y en a plusieurs -->
+                      <xsl:choose>
+							<xsl:when test="count(Mj_Suf) > 1">
+                        
+								<xsl:for-each select="Mj_Suf">
+								  
+								  <tr>
+									
+									<td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+									  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+									  </div>
+									</td>
+									
+									<td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+									  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+									  </div>
+									</td>
+									
+									<td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+									  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+									  </div>
+									</td>
+									
+									<td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+									  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+									  </div>
+									</td>
+									
+									<td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+									  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+									  </div>
+									</td>
+									
+									<td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden; border-left: hidden;" valign="top">
+									  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+									  </div>
+									</td>
+									
+									<td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+									  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+									  </div>
+									</td>
+									
+									<td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden; border-left: hidden;" valign="top">
+									  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+									  </div>
+									</td>
+									
+									<td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden; border-left: hidden;" valign="top">
+									  
+									  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+										<xsl:value-of select="@s_tar"/>
+									  </div>
+									</td>
+									
+									<td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+									  
+									  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+										<xsl:value-of select="@suf"/>
+									  </div>
+									</td>
+									
+									<td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+									  
+									  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+										<xsl:value-of select="@grss_gr"/>
+									  </div>
+									</td>
+									
+									<td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+									  
+									  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+										<xsl:value-of select="@clas"/>
+									  </div>
+									</td>
+									
+									<td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+									  
+									  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+										<xsl:value-of select="@nat_cult"/>
+									  </div>
+									</td>
+									
+									<td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+									  
+									  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+										<xsl:value-of select="@ha"/>
+									  </div>
+									</td>
+									
+									<td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden; border-left: hidden;" valign="top">
+									  
+									  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+										<xsl:value-of select="@a"/>
+									  </div>
+									</td>
+									
+									<td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden; border-left: hidden;" valign="top">
+									  
+									  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+										<xsl:value-of select="@ca"/>
+									  </div>
+									</td>
+									
+									<td style="padding-right: 0.1cm; border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+									  
+									  <div style="text-align: center;line-height: 0.3cm; vertical-align: middle;" >
+										<xsl:value-of select="@revenu_cadastral"/>
+									  </div>
+									</td>
+									<xsl:if test="$type='complet'">
+									  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+										<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+										</div>
+									  </td>
+
+									  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+
+										<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+										  <xsl:value-of select="@nat_exo"/>
+										</div>
+									  </td>
+
+									  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+										<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+										</div>
+									  </td>
+
+									  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+										<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+										</div>
+									  </td>
+
+									  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+										<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+										</div>
+									  </td>
+									</xsl:if>
+									<td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+									  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+									  </div>
+									</td>
+								  </tr>
+								  <xsl:if test="$type='complet'">
+									<!-- Affichage des Exon_Suf lorsqu'il y en a -->
+									<xsl:if test="count(Mj_Exon_Suf) &gt; 0">
+									  <xsl:for-each select="Mj_Exon_Suf">
+										<tr>
+										  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="border-left: hidden; border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="padding-right: 0.1cm; border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;border-left: hidden;" valign="top">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="border-left: hidden; border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;border-right: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="border-left: hidden; padding-right: 0.1cm; border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;border-right: hidden;border-left: hidden;" valign="top">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="padding-right: 0.1cm; border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="border-rigth: hidden; border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="border-rigth: hidden; padding-right: 0.1cm; border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;border-left: hidden;border-right: hidden;" valign="top">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="border-left: hidden; padding-right: 0.1cm; border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;border-left: hidden;" valign="top">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="padding-right: 0.1cm; border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											  <xsl:value-of select="@ccolloc" />
+											</div>
+										  </td>
+
+										  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											  <xsl:value-of select="@nat_exo" />
+											</div>
+										  </td>
+
+										  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											  <xsl:value-of select="@pexn div 100" />
+											</div>
+										  </td>
+
+										  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											  <xsl:value-of select="@rcexnba div 100" />
+											</div>
+										  </td>
+
+										  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+										</tr>
+									  </xsl:for-each>
+									</xsl:if>
+								  </xsl:if>
+								</xsl:for-each>
+							  </xsl:when>
+							  <xsl:when test="count(Mj_Suf)>0">
+								<xsl:if test="$type='complet'">
+								 <xsl:for-each select="Mj_Suf">
+									<!-- Affichage des Exon_Suf lorsqu'il y en a -->
+									<xsl:if test="count(Mj_Exon_Suf) &gt; 0">
+									  <xsl:for-each select="Mj_Exon_Suf">
+										<tr>
+										  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="border-left: hidden; border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="padding-right: 0.1cm; border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;border-left: hidden;" valign="top">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="border-left: hidden; border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;border-right: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="border-left: hidden; padding-right: 0.1cm; border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;border-right: hidden;border-left: hidden;" valign="top">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="padding-right: 0.1cm; border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="border-rigth: hidden; border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="border-rigth: hidden; padding-right: 0.1cm; border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;border-left: hidden;border-right: hidden;" valign="top">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="border-left: hidden; padding-right: 0.1cm; border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;border-left: hidden;" valign="top">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="padding-right: 0.1cm; border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											  <xsl:value-of select="@ccolloc" />
+											</div>
+										  </td>
+
+										  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											  <xsl:value-of select="@nat_exo" />
+											</div>
+										  </td>
+
+										  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											  <xsl:value-of select="@pexn div 100" />
+											</div>
+										  </td>
+
+										  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											  <xsl:value-of select="@rcexnba div 100" />
+											</div>
+										  </td>
+
+										  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+										</tr>
+									  </xsl:for-each>
+									</xsl:if>
+									</xsl:for-each>
+									</xsl:if>
+								 </xsl:when>
+						</xsl:choose>
+                    </xsl:for-each>
+                  </tbody>
+                </table>
+              </td>
+            </tr>
+            
+            <!-- Affichage du pied du tableau des proprietes non baties -->
+            
+            <tr>
+              
+              <td>
+                
+                <div keep-together="always" keep-with-previous="always">
+                  
+                  <table width="100%" table-layout="fixed" style="border-color: black; border-right: 0.5pt; border-left: 0.5pt; border-top: 0pt; border-bottom: 0.5pt; border-style: solid; border-collapse: collapse; font-size: 8pt; padding-top: 0.2cm; padding-bottom: 0.1cm;">
+
+                    <td width="3.45%" />
+                    <td width="3.45%" />
+                    <td width="3.45%" />
+                    <td width="3.45%" />
+                    <td width="13.46%" />
+                    <td width="6.9%" />
+                    <td width="6.9%" />
+                    <td width="5.18%" />
+                    <td width="6.9%" />
+                    <td width="6.9%" />
+                    <td width="5.18%" />
+                    <td width="6.9%" />
+                    <td width="6.9%" />
+                    <td width="5.18%" />
+                    <td width="6.9%" />
+                    <td width="7.94%" />
+                    
+                    <tbody>
+                      
+                      <xsl:for-each select="Mj/Mj_Compte_Communal | Mj/Mj_Compte_Communal_Parcelle">
+                        
+                        <tr>
+
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;">
+                            </div>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: center; line-height: 0.20cm; vertical-align: middle;">HA</div>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: center; line-height: 0.20cm; vertical-align: middle;">A</div>
+                          </td>
+
+                          <td>
+                            <div style="text-align: center; line-height: 0.20cm; vertical-align: middle;">CA</div>
+                          </td>
+                          <xsl:if test="$type='complet'">
+                            <td>
+                              <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                            </td>
+
+                            <td>
+                              <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                            </td>
+
+                            <td>
+                              <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                            </td>
+
+                            <td>
+                              <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;">R EXO</div>
+                            </td>
+
+                            <td>
+
+                              <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;">
+                                <xsl:value-of select="@exo_com_par_float"/>
+
+
+                                EUR
+                              </div>
+                            </td>
+
+                            <td>
+                              <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                            </td>
+
+                            <td>
+                              <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;">R EXO</div>
+                            </td>
+
+                            <td>
+
+                              <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;">
+                                <xsl:value-of select="@exo_tax_ad_par_float"/>
+
+
+                                EUR
+                              </div>
+                            </td>
+
+                            <td>
+                              <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                            </td>
+
+                            <td>
+                              <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"></div>
+                            </td>
+
+                            <td>
+
+                              <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;">
+                              </div>
+                            </td>
+
+                            <td>
+                              <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                            </td>
+                          </xsl:if>
+                        </tr>
+                        
+                        <tr>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.60cm; vertical-align: middle;">CONT</div>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.60cm; vertical-align: middle;">REV IMPOSABLE</div>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.60cm; vertical-align: middle;">
+                              <xsl:value-of select="@rev_impo_par_float"/>
+
+
+                              EUR
+                            </div>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.60cm; vertical-align: middle;">COM</div>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.60cm; vertical-align: middle;">TAXE AD</div>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.60cm; vertical-align: middle;"></div>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                          </td>
+                          
+                          <td padding-right="0.8cm">
+                            <div style="text-align: right; line-height: 0.60cm; vertical-align: middle;">MAJ POS</div>
+                          </td>
+                        </tr>
+                        
+                        <tr>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;">
+                            </div>
+                          </td>
+                          
+                          <td>
+                            
+                            <div style="text-align: center; line-height: 0.20cm; vertical-align: middle;">
+                              <xsl:value-of select="@ha"/>
+                            </div>
+                          </td>
+                          
+                          <td>
+                            
+                            <div style="text-align: center; line-height: 0.20cm; vertical-align: middle;">
+                              <xsl:value-of select="@a"/>
+                            </div>
+                          </td>
+                          
+                          <td>
+                            
+                            <div style="text-align: center; line-height: 0.20cm; vertical-align: middle;">
+                              <xsl:value-of select="@ca"/>
+                            </div>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;">R IMP</div>
+                          </td>
+                          
+                          <td>
+                            
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;">
+                              <xsl:value-of select="@rev_impo_com_par_float"/>
+
+
+                              EUR
+                            </div>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;">R IMP</div>
+                          </td>
+                          
+                          <td>
+                            
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;">
+                              <xsl:value-of select="@rev_impo_taxe_ad_par_float"/>
+
+
+                              EUR
+                            </div>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"></div>
+                          </td>
+                          
+                          <td>
+                            
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;">
+                            </div>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                          </td>
+                        </tr>
+                      </xsl:for-each>
+                    </tbody>
+                    
+                    <!-- Fin de la table du pied du tableau des propiétés non baties -->
+                  </table>
+                </div>
+              </td>
+            </tr>
+            <!-- Fin du corps du tableau global -->
+          </tbody>
+          <!-- Fin du tableau global -->
+        </table>
+      </body>
+    </html>
+  </xsl:template>
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/src/module_cadastre/web_service/class/majic_lib/xsl/commande_fo2html.txt b/src/module_cadastre/web_service/class/majic_lib/xsl/commande_fo2html.txt
new file mode 100755
index 0000000000000000000000000000000000000000..53435cedf0c3491c0f763b8f7f306295eecc22fe
--- /dev/null
+++ b/src/module_cadastre/web_service/class/majic_lib/xsl/commande_fo2html.txt
@@ -0,0 +1,5 @@
+fop -xml monxml.xml -xsl mj_fo.xsl -foout res.fo
+fop -xml res.fo -xsl fo2html.xsl -foout res.html
+
+
+C:\serveurs\fop-0.93\fop -xml C:\serveurs\Apache2\htdocs\rgd\fp\2010\complet\740011000AR0497.xml -xsl C:\serveurs\Apache2\htdocs\lib\majic_lib\xsl\FP_fo_Complet.xsl -pdf C:\serveurs\Apache2\htdocs\rgd\fp\2010\complet\740011000AR0497.pdf
\ No newline at end of file
diff --git a/src/module_cadastre/web_service/class/majic_lib/xsl/fo2html.xsl b/src/module_cadastre/web_service/class/majic_lib/xsl/fo2html.xsl
new file mode 100755
index 0000000000000000000000000000000000000000..a4ca0b5740c2d846731cbd7d9ae1e55b5641b8bc
--- /dev/null
+++ b/src/module_cadastre/web_service/class/majic_lib/xsl/fo2html.xsl
@@ -0,0 +1,643 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!-- =============================================================== -->
+<!--                                                                 -->
+<!-- Convert XSL FO (as in REC 2001-10-15) to HTML                    -->
+<!--                                                                 -->
+<!-- � RenderX 2000-2001                                             -->
+<!-- Permission to copy and modify is granted, provided this notice  -->
+<!-- is included in all copies and/or derived work.                  -->
+<!--                                                                 -->
+<!-- Author: Nikolai Grigoriev, grig@renderx.com                     -->
+<!--                                                                 -->
+<!-- =============================================================== -->
+<!DOCTYPE xsl:stylesheet [
+  <!ENTITY anchor "<xsl:apply-templates select='@id' xmlns:xsl='http://www.w3.org/1999/XSL/Transform'/>">
+  <!ENTITY add-style "<xsl:call-template name='add-style-attribute' xmlns:xsl='http://www.w3.org/1999/XSL/Transform'/>">
+]>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format" exclude-result-prefixes="fo">
+
+<xsl:output method="html" version="4.0" encoding="utf-8" doctype-public="-//W3C//DTD HTML 4.0 Transitional//EN" indent="no"/>
+
+<!-- =============================================================== -->
+<!-- Root. Create the bone and call templates for each page sequence -->
+<!-- =============================================================== -->
+
+<xsl:template match="fo:root">
+  <html>
+    <head>
+      <title>
+        <xsl:choose>
+          <xsl:when test="descendant::fo:title[1]">
+            <xsl:value-of select="fo:title"/>
+          </xsl:when>
+          <xsl:otherwise>XSL FO Document</xsl:otherwise>
+        </xsl:choose>
+      </title>
+      <META http-equiv="Content-Style-Type" content="text/css"/>
+      <style type="text/css">
+        a { color: black; border: none; text-decoration: none; }
+        img { border: none; }
+      </style>
+    </head>
+
+    <body bgcolor="white" marginwidth="6" marginheight="6" leftmargin="6" topmargin="6">
+      <xsl:apply-templates select="fo:page-sequence"/>
+    </body>
+  </html>
+
+</xsl:template>
+
+<!-- =============================================================== -->
+<!-- fo:page-sequence. Draws a header before and a footer after.     -->
+<!-- Sidebars are skipped: there's no way to rotate the text in HTML -->
+<!-- and horizontal text in the sidebars eats up too much space.     -->
+<!-- =============================================================== -->
+
+<xsl:template match="fo:page-sequence">
+
+    <xsl:variable name="current-master"><xsl:value-of select="@master-reference"/></xsl:variable>
+
+    <!-- One page master will be used for the whole page sequence -->
+    <xsl:variable name="page-master-name">
+      <xsl:choose>
+        <xsl:when test="../fo:layout-master-set/fo:simple-page-master[@master-name=$current-master]">
+          <!-- specified master is a page master: use it -->
+          <xsl:value-of select="$current-master"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <!-- specified master is a page sequence master: -->
+          <!-- find master name for the first page -->
+          <xsl:apply-templates select="../fo:layout-master-set/fo:page-sequence-master[@master-name=$current-master]"/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+
+    <!-- Load the page master into a variable. No problem if it's null; should work the same ;-) -->
+    <xsl:variable name="page-master" select="../fo:layout-master-set/fo:simple-page-master[@master-name=$page-master-name]"/>
+
+
+    <!-- Start real drawing -->
+    <br/>  <!-- make an offset before each page sequence -->
+
+    <!-- Header -->
+    <xsl:variable name="header-region" select="$page-master/fo:region-before"/>
+    <xsl:apply-templates select="fo:static-content[@flow-name = $header-region/@region-name                               or (@flow-name='xsl-region-before' and not($header-region/@region-name))]">
+      <xsl:with-param name="region" select="$header-region"/>
+    </xsl:apply-templates>
+
+    <!-- Body -->
+    <xsl:apply-templates select="fo:flow">
+      <xsl:with-param name="region" select="$page-master/fo:region-body"/>
+    </xsl:apply-templates>
+
+    <!-- Footer -->
+    <xsl:variable name="footer-region" select="$page-master/fo:region-after"/>
+    <xsl:apply-templates select="fo:static-content[@flow-name = $footer-region/@region-name                               or (@flow-name='xsl-region-after' and not($footer-region/@region-name))]">
+      <xsl:with-param name="region" select="$footer-region"/>
+    </xsl:apply-templates>
+
+    <br/>  <!-- make an offset after each page sequence -->
+
+</xsl:template>
+
+<!-- =============================================================== -->
+<!-- fo:block                                                        -->
+<!-- =============================================================== -->
+
+<xsl:template match="fo:block">
+  <xsl:apply-templates select="@id" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"/><div><xsl:call-template name="add-style-attribute" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"/><xsl:apply-templates mode="check-for-pre"/></div>
+</xsl:template>
+
+<!-- =============================================================== -->
+<!-- fo:inline-sequence                                              -->
+<!-- =============================================================== -->
+
+<xsl:template match="fo:inline | fo:wrapper">
+  <xsl:apply-templates select="@id" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"/><span><xsl:call-template name="add-style-attribute" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"/><xsl:apply-templates/></span>
+</xsl:template>
+
+<!-- =============================================================== -->
+<!-- fo:list-block                                                   -->
+<!-- =============================================================== -->
+
+<xsl:template match="fo:list-block">
+  <xsl:variable name="label-separation">
+    <xsl:choose>
+      <xsl:when test="@provisional-label-separation">
+        <xsl:apply-templates select="@provisional-label-separation" mode="convert-to-pixels"/>
+      </xsl:when>
+      <xsl:otherwise>8</xsl:otherwise>
+    </xsl:choose>
+  </xsl:variable>
+
+  <xsl:variable name="body-offset">
+    <xsl:choose>
+      <xsl:when test="@provisional-distance-between-starts">
+        <xsl:apply-templates select="@provisional-distance-between-starts" mode="convert-to-pixels"/>
+      </xsl:when>
+      <xsl:otherwise>32</xsl:otherwise>
+    </xsl:choose>
+  </xsl:variable>
+
+  <div><xsl:call-template name="add-style-attribute" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"/>
+    <xsl:apply-templates select="@id" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"/>
+    <table width="100%">
+      <xsl:apply-templates select="fo:list-item | fo:list-item-label">
+        <xsl:with-param name="label-width" select="$body-offset - $label-separation"/>
+        <xsl:with-param name="gap-width" select="$label-separation"/>
+      </xsl:apply-templates>
+    </table>
+  </div>
+
+</xsl:template>
+
+<!-- =============================================================== -->
+<!-- fo:list-item                                                    -->
+<!-- =============================================================== -->
+
+<xsl:template match="fo:list-item">
+  <xsl:param name="label-width"/>
+  <xsl:param name="gap-width"/>
+
+  <tr><xsl:call-template name="add-style-attribute" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"/>
+    <xsl:apply-templates select="fo:list-item-label" mode="draw-cell">
+       <xsl:with-param name="width" select="$label-width"/>
+    </xsl:apply-templates>
+    <xsl:if test="$gap-width &gt; 0">
+      <td width="{$gap-width}">�</td>
+    </xsl:if>
+
+    <xsl:apply-templates select="fo:list-item-body" mode="draw-cell"/>
+  </tr>
+</xsl:template>
+
+<!-- =============================================================== -->
+<!-- fo:list-item-label - itemless lists                             -->
+<!-- =============================================================== -->
+
+<xsl:template match="fo:list-block/fo:list-item-label">
+  <xsl:param name="label-width"/>
+  <xsl:param name="gap-width"/>
+
+  <tr>
+    <xsl:apply-templates select="." mode="draw-cell">
+       <xsl:with-param name="width" select="$label-width"/>
+    </xsl:apply-templates>
+    <xsl:if test="$gap-width &gt; 0">
+      <td width="{$gap-width}">�</td>
+    </xsl:if>
+
+    <xsl:apply-templates select="following-sibling::fo:list-item-body[1]" mode="draw-cell"/>
+  </tr>
+</xsl:template>
+
+
+<!-- =============================================================== -->
+<!-- fo:list-item-body - itemless lists                              -->
+<!-- =============================================================== -->
+
+<xsl:template match="fo:list-item-label | fo:list-item-body" mode="draw-cell">
+  <xsl:param name="width" select="'auto'"/>
+  <td valign="top"><xsl:call-template name="add-style-attribute" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"/><xsl:apply-templates select="@id" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"/>
+    <xsl:if test="$width != 'auto'">
+      <xsl:attribute name="width">
+        <xsl:value-of select="$width"/>
+      </xsl:attribute>
+    </xsl:if>
+
+    <xsl:apply-templates mode="check-for-pre"/>
+  </td>
+</xsl:template>
+
+
+<!-- =============================================================== -->
+<!-- fo:table and its components                                     -->
+<!-- =============================================================== -->
+
+<xsl:template match="fo:table">
+  <xsl:apply-templates select="@id" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"/>
+  <table><xsl:call-template name="add-style-attribute" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"/>
+    <xsl:if test="not(@display-align)">
+      <xsl:attribute name="valign">top</xsl:attribute>
+	  <xsl:attribute name="width">100%</xsl:attribute>
+	  <xsl:attribute name="CELLSPACING">0</xsl:attribute>
+	  <xsl:attribute name="CELLPADDING">0</xsl:attribute>
+    </xsl:if>
+
+    <xsl:apply-templates/>
+  </table>
+</xsl:template>
+
+<xsl:template match="fo:table-header">
+  <thead><xsl:call-template name="add-style-attribute" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"/>
+    <xsl:apply-templates/>
+  </thead>
+</xsl:template>
+
+<xsl:template match="fo:table-footer">
+  <tfoot><xsl:call-template name="add-style-attribute" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"/>
+    <xsl:apply-templates/>
+  </tfoot>
+</xsl:template>
+
+<xsl:template match="fo:table-body">
+  <tbody><xsl:call-template name="add-style-attribute" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"/>
+    <xsl:apply-templates/>
+  </tbody>
+</xsl:template>
+
+<xsl:template match="fo:table-row">
+  <tr><xsl:call-template name="add-style-attribute" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"/>
+    <xsl:apply-templates mode="display"/>
+  </tr>
+</xsl:template>
+
+<xsl:template match="fo:table-cell" mode="display">
+  <td><xsl:call-template name="add-style-attribute" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"/>
+    <xsl:if test="not(@display-align)">
+      <xsl:attribute name="valign">top</xsl:attribute>
+	  <!-- <xsl:attribute name="style">border-right:true</xsl:attribute>-->
+    </xsl:if>
+	
+    <xsl:apply-templates select="@*" mode="get-table-attributes"/>
+    <xsl:apply-templates mode="check-for-pre"/>
+  </td>
+</xsl:template>
+
+<xsl:template match="fo:table-cell" priority="-1"/>
+
+<!-- This template accounts for "rowless" tables -->
+<xsl:template priority="1" match="fo:table-cell[not(parent::fo:table-row)]               [not(preceding-sibling::fo:table-cell) or @starts-row='true'                or preceding-sibling::fo:table-cell[1][@ends-row='true']]">
+  <tr>
+    <xsl:call-template name="enumerate-rowless-cells"/>
+  </tr>
+</xsl:template>
+
+<xsl:template name="enumerate-rowless-cells">
+  <xsl:apply-templates select="." mode="display"/>
+  <xsl:if test="not(@ends-row='true')">
+    <xsl:for-each select="following-sibling::fo:table-cell[1]                           [not(@starts-row='true')]">
+      <xsl:call-template name="enumerate-rowless-cells"/>
+    </xsl:for-each>
+  </xsl:if>
+</xsl:template>
+
+
+<!-- =============================================================== -->
+<!-- fo:inline-graphic                                               -->
+<!-- =============================================================== -->
+
+<xsl:template match="fo:external-graphic">
+  <xsl:variable name="cleaned-url">
+    <xsl:apply-templates select="@src" mode="unbracket-url"/>
+  </xsl:variable>
+  <xsl:apply-templates select="@id" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"/><img src="{$cleaned-url}"><xsl:apply-templates select="@height|@width|@*[starts-with(name(),'border')]"/></img>
+</xsl:template>
+
+<!-- =============================================================== -->
+<!-- fo:basic-link                                                  -->
+<!-- =============================================================== -->
+
+<xsl:template match="fo:basic-link[@external-destination]">
+
+  <xsl:variable name="cleaned-url">
+    <xsl:apply-templates select="@external-destination" mode="unbracket-url"/>
+  </xsl:variable>
+
+  <xsl:apply-templates select="@id" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"/><a href="{$cleaned-url}"><xsl:call-template name="add-style-attribute" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"/><xsl:apply-templates/></a>
+</xsl:template>
+
+<xsl:template match="fo:basic-link[@internal-destination]">
+  <xsl:apply-templates select="@id" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"/><a href="#{@internal-destination}"><xsl:call-template name="add-style-attribute" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"/><xsl:apply-templates/></a>
+</xsl:template>
+
+
+<!-- =============================================================== -->
+<!-- fo:marker/fo:retrieve-marker                                    -->
+<!-- =============================================================== -->
+
+<xsl:template match="fo:marker"/>
+<xsl:template match="fo:marker" mode="retrieve-marker">
+  <xsl:apply-templates/>
+</xsl:template>
+
+<xsl:template match="fo:retrieve-marker">
+
+  <xsl:variable name="class-name" select="@retrieve-class-name"/>
+  <xsl:variable name="matching-markers" select="ancestor::fo:page-sequence/descendant::fo:marker[@marker-class-name=$class-name]"/>
+
+  <xsl:choose>
+    <xsl:when test="@retrieve-position='last-starting-within-page'                  or @retrieve-position='last-ending-within-page'">
+      <xsl:apply-templates select="$matching-markers[position()=last()]" mode="retrieve-marker"/>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:apply-templates select="$matching-markers[1]" mode="retrieve-marker"/>
+    </xsl:otherwise>
+  </xsl:choose>
+
+</xsl:template>
+
+
+
+
+
+<!-- *************************************************************** -->
+<!-- Treatment of attributes that are either identical to their CSS1 -->
+<!-- counterparts, of find an equivalent expression there            -->
+
+<!-- =============================================================== -->
+<!-- Default rule: copy CSS1 attributes and suppress all other       -->
+<!-- =============================================================== -->
+
+<xsl:template match="@*" priority="-2" mode="collect-style-attributes"/>
+
+<xsl:template match="@color |                      @background |                      @background-color |                      @background-image |                      @background-position |                      @background-repeat |                      @padding |                      @padding-top |                      @padding-bottom |                      @padding-right |                      @padding-left |                      @margin |                      @margin-top |                      @margin-bottom |                      @margin-right |                      @margin-left |                      @border |                     @border-width |                      @border-top-width |                      @border-bottom-width |                      @border-right-width |                      @border-left-width |                      @border-color |                      @border-top-color |                      @border-bottom-color |                      @border-right-color |                      @border-left-color |                      @border-style |                      @border-top-style |                      @border-bottom-style |                      @border-right-style |                      @border-left-style |                      @letter-spacing |                      @word-spacing |                      @line-height |                      @font |                      @font-family |                      @font-size |                      @font-weight |                      @font-style |                      @font-variant |                      @vertical-align |                      @text-decoration |                      @text-indent |                      @text-transform" mode="collect-style-attributes">
+  <xsl:value-of select="name()"/>
+  <xsl:text>: </xsl:text>
+  <xsl:value-of select="."/>
+  <xsl:text>; </xsl:text>
+</xsl:template>
+
+<!-- =============================================================== -->
+<!-- Some attributes deserve special treatment -->
+
+<xsl:template match="@text-align" mode="collect-style-attributes">
+  <xsl:text>text-align: </xsl:text>
+  <xsl:choose>
+    <xsl:when test=".='start' or .='inside'">left</xsl:when>
+    <xsl:when test=".='end' or .='outside'">right</xsl:when>
+    <xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
+  </xsl:choose>
+  <xsl:text>; </xsl:text>
+</xsl:template>
+
+<!-- =============================================================== -->
+<!-- Handling writing-mode in borders, padding, and margins          -->
+<!-- This version presumes lr-tb writing mode only.                  -->
+
+<xsl:template match="@space-before.optimum |                      @space-before [not (../@space-before.optimum)] |                      @space-before.minimum [not (../@space-before.optimum) and not (../@space-before)] |                      @space-before.maximum [not (../@space-before.optimum) and not (../@space-before) and not (../@space-before.minimum)] |                      @space-after.optimum |                      @space-after [not (../@space-after.optimum)] |                      @space-after.minimum [not (../@space-after.optimum) and not (../@space-after)] |                      @space-after.maximum [not (../@space-after.optimum) and not (../@space-after) and not (../@space-after.minimum)] |                      @space-start.optimum |                      @space-start [not (../@space-start.optimum)] |                      @space-start.minimum [not (../@space-start.optimum) and not (../@space-start)] |                      @space-start.maximum [not (../@space-start.optimum) and not (../@space-start) and not (../@space-start.minimum)] |                      @space-end.optimum |                      @space-end [not (../@space-end.optimum)] |                      @space-end.minimum [not (../@space-end.optimum) and not (../@space-end)] |                      @space-end.maximum [not (../@space-end.optimum) and not (../@space-end) and not (../@space-end.minimum)] |                      @start-indent[not(parent::fo:list-item-body)] |                      @end-indent[not(parent::fo:list-item-label)] |                      @padding-before |                      @padding-before.length |                      @margin-before |                      @border-before |                      @border-before-width |                      @border-before-width.length |                      @border-before-color |                      @border-before-style |                      @padding-after |                      @padding-after.length |                      @margin-after |                      @border-after |                      @border-after-width |                      @border-after-width.length |                      @border-after-color |                      @border-after-style |                      @padding-start |                      @padding-start.length |                      @margin-start |                      @border-start |                      @border-start-width |                      @border-start-width.length |                      @border-start-color |                      @border-start-style |                      @padding-end |                      @padding-end.length |                      @margin-end |                      @border-end |                      @border-end-width |                      @border-end-width.length |                      @border-end-color |                      @border-end-style" mode="collect-style-attributes">
+
+  <xsl:variable name="property">
+    <xsl:choose>
+      <xsl:when test="starts-with(name(), 'border')">border</xsl:when>
+      <xsl:when test="starts-with(name(), 'padding')">padding</xsl:when>
+      <xsl:when test="starts-with(name(), 'margin')">margin</xsl:when>
+      <xsl:when test="starts-with(name(), 'space')">margin</xsl:when>
+      <xsl:when test="contains(name(), '-indent')">margin</xsl:when>
+    </xsl:choose>
+  </xsl:variable>
+
+  <xsl:variable name="side">
+    <xsl:choose>
+      <xsl:when test="contains(name(), '-before') or contains(name(), '-top')">-top</xsl:when>
+      <xsl:when test="contains(name(), '-after') or contains(name(), '-bottom')">-bottom</xsl:when>
+      <xsl:when test="contains(name(), '-start') or starts-with(name(), 'start-') or contains(name(), '-left')">-left</xsl:when>
+      <xsl:when test="contains(name(), '-end') or starts-with(name(), 'end-') or contains(name(), '-right')">-right</xsl:when>
+    </xsl:choose>
+  </xsl:variable>
+
+  <xsl:variable name="parameter">
+    <xsl:choose>
+      <xsl:when test="contains(name(), '-width')">-width</xsl:when>
+      <xsl:when test="contains(name(), '-color')">-color</xsl:when>
+      <xsl:when test="contains(name(), '-style')">-style</xsl:when>
+    </xsl:choose>
+  </xsl:variable>
+
+  <xsl:value-of select="concat($property, $side, $parameter)"/>
+  <xsl:text>: </xsl:text>
+  <xsl:value-of select="."/>
+  <xsl:text>; </xsl:text>
+</xsl:template>
+
+<xsl:template match="*" mode="check-for-pre" priority="-1">
+  <xsl:apply-templates select="."/>
+</xsl:template>
+
+<xsl:template match="*[@white-space-collapse='false'                     or @linefeed-treatment='preserve'                     or @wrap-option='no-wrap'                     or @white-space='pre']" mode="check-for-pre">
+  <pre><xsl:apply-templates select="."/></pre>
+</xsl:template>
+
+<!-- =============================================================== -->
+<!-- Recalculate a length to pixels. 1 in = 96 px, 1 em = 1 pc;      -->
+<!-- this gives reasonable results for 800x600 and 1024x768 screens  -->
+<!-- =============================================================== -->
+
+<xsl:template match="@*" mode="convert-to-pixels">
+  <xsl:variable name="scaling-factor">
+    <xsl:choose>
+      <xsl:when test="contains (., 'pt')">1.33</xsl:when>
+      <xsl:when test="contains (., 'px')">1</xsl:when>
+      <xsl:when test="contains (., 'pc')">16</xsl:when>
+      <xsl:when test="contains (., 'in')">96</xsl:when>
+      <xsl:when test="contains (., 'cm')">37.8</xsl:when>
+      <xsl:when test="contains (., 'mm')">3.78</xsl:when>
+      <xsl:when test="contains (., 'em')">16</xsl:when> <!-- guess: 1em = 12pt -->
+      <xsl:otherwise>1</xsl:otherwise>
+    </xsl:choose>
+  </xsl:variable>
+
+  <xsl:variable name="numeric-value" select="translate (., '-0123456789.ptxcinme', '-0123456789.')"/>
+  <xsl:value-of select="$numeric-value * $scaling-factor"/>
+</xsl:template>
+
+<!-- =============================================================== -->
+<!-- Remove brackets & quotes around URLs                            -->
+<!-- =============================================================== -->
+
+<xsl:template match="@*" mode="unbracket-url">
+  <xsl:variable name="href" select="normalize-space(.)"/>
+
+  <xsl:choose>
+    <xsl:when test="(starts-with($href, 'url(') or starts-with($href, 'url ('))                      and substring ($href, string-length($href)) = ')'">
+      <!-- Remove 'url' from the beginning -->
+      <xsl:variable name="bracketed" select="normalize-space(substring($href, 4))"/>
+      <!-- Remove brackets -->
+      <xsl:variable name="quoted" select="normalize-space(substring($bracketed, 2, string-length ($bracketed) - 2 ))"/>
+
+      <xsl:variable name="q" select="'&quot;'"/>
+      <xsl:variable name="a" select="&quot;'&quot;"/>
+      <!-- Remove optional quotes -->
+      <xsl:choose>
+        <xsl:when test="( substring($quoted, 1, 1) = $q and                           substring($quoted, string-length($quoted), 1) = $q )                      or ( substring($quoted, 1, 1) = $a and                           substring($quoted, string-length($quoted), 1) = $a )">
+          <xsl:value-of select="substring($quoted, 2, string-length($quoted) - 2)"/>
+        </xsl:when>
+        <xsl:otherwise><xsl:value-of select="$quoted"/></xsl:otherwise>
+      </xsl:choose>
+    </xsl:when>
+    <xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
+
+<!-- =============================================================== -->
+<!-- Page number - replace by a bullet                               -->
+<!-- =============================================================== -->
+
+<xsl:template match="fo:page-number | fo:page-number-citation">
+  <span><xsl:call-template name="add-style-attribute" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"/><xsl:text>&#8226;</xsl:text></span>
+</xsl:template>
+
+<!-- =============================================================== -->
+<!-- Leader - replace by a space                                     -->
+<!-- =============================================================== -->
+
+<xsl:template match="fo:leader">
+  <xsl:text> ��� </xsl:text>
+</xsl:template>
+
+
+
+<!-- =============================================================== -->
+<!-- Static content - add a <hr/> before or after it                 -->
+<!-- =============================================================== -->
+
+<xsl:template match="fo:flow | fo:static-content">
+  <xsl:param name="region"/>
+
+  <div><xsl:call-template name="add-style-attribute" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"/><xsl:apply-templates select="@id" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"/>
+    <xsl:apply-templates select="$region"/>
+    <xsl:apply-templates/>
+    <xsl:if test=".//fo:footnote">
+      <br/><hr/>
+      <xsl:apply-templates select=".//fo:footnote" mode="after-text"/>
+    </xsl:if>
+  </div>
+</xsl:template>
+
+<!-- =============================================================== -->
+<!-- Footnotes                                                       -->
+<!-- =============================================================== -->
+
+<xsl:template match="fo:footnote">
+  <xsl:apply-templates select="fo:inline"/>
+</xsl:template>
+
+<xsl:template match="fo:footnote" mode="after-text">
+  <div><xsl:call-template name="add-style-attribute" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"/><xsl:apply-templates select="@id" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"/>
+    <xsl:apply-templates select="fo:footnote-body"/>
+  </div>
+</xsl:template>
+
+<!-- =============================================================== -->
+<!-- Copy all CSS1-compatible attributes to "style" property         -->
+<!-- =============================================================== -->
+
+<xsl:template name="add-style-attribute">
+  <xsl:param name="orientation" select="0"/>
+  <xsl:variable name="style">
+    <xsl:apply-templates select="@*" mode="collect-style-attributes"/>
+  </xsl:variable>
+
+  <xsl:if test="string-length($style) &gt; 0">
+    <xsl:attribute name="style"><xsl:value-of select="normalize-space($style)"/></xsl:attribute>
+  </xsl:if>
+</xsl:template>
+
+<!-- =============================================================== -->
+<!-- Create an anchor                                                -->
+<!-- =============================================================== -->
+
+<xsl:template match="@id"><a name="{.}"/></xsl:template>
+
+<!-- =============================================================== -->
+<!-- Table cell geometry                                             -->
+<!-- =============================================================== -->
+
+<xsl:template match="@*" mode="get-table-attributes" priority="-1"/>
+
+<xsl:template match="@number-columns-spanned" mode="get-table-attributes">
+  <xsl:attribute name="colspan"><xsl:value-of select="."/></xsl:attribute>
+</xsl:template>
+
+<xsl:template match="@number-rows-spanned" mode="get-table-attributes">
+  <xsl:attribute name="rowspan"><xsl:value-of select="."/></xsl:attribute>
+</xsl:template>
+
+
+
+<!-- =============================================================== -->
+<!-- Page layout: determine master name for the first page           -->
+<!-- =============================================================== -->
+
+<xsl:template match="fo:page-sequence-master">
+  <xsl:apply-templates select="*[1]"/>
+</xsl:template>
+
+<xsl:template match="fo:single-page-master-reference                    | fo:repeatable-page-master-reference">
+  <xsl:value-of select="@master-reference"/>
+</xsl:template>
+
+<xsl:template match="fo:repeatable-page-master-alternatives">
+  <xsl:choose>
+    <xsl:when test="fo:conditional-page-master-reference[@page-position='first']">
+      <xsl:value-of select="fo:conditional-page-master-reference[@page-position='first'][1]/@master-reference"/>
+    </xsl:when>
+    <xsl:when test="fo:conditional-page-master-reference[@odd-or-even='odd' and not (@blank-or-not-blank='blank')]">
+      <xsl:value-of select="fo:conditional-page-master-reference[@odd-or-even='odd' and not (@blank-or-not-blank='blank')][1]/@master-reference"/>
+    </xsl:when>
+    <xsl:when test="fo:conditional-page-master-reference[not(@odd-or-even='even') and not (@blank-or-not-blank='blank')]">
+      <xsl:value-of select="fo:conditional-page-master-reference[not(@odd-or-even='even') and not (@blank-or-not-blank='blank')][1]/@master-reference"/>
+    </xsl:when>
+    <xsl:otherwise> <!-- cannot guess; take the first -->
+      <xsl:value-of select="fo:conditional-page-master-reference[1]/@master-reference"/>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
+
+
+<!-- =============================================================== -->
+<!-- Header/footer properties                                        -->
+<!-- =============================================================== -->
+
+
+<xsl:template match="@extent">
+  <xsl:attribute name="width"><xsl:apply-templates select="." mode="convert-to-pixels"/></xsl:attribute>
+</xsl:template>
+
+<xsl:template match="@width | @height">
+  <xsl:attribute name="{name()}"><xsl:apply-templates select="." mode="convert-to-pixels"/></xsl:attribute>
+</xsl:template>
+
+<xsl:template match="fo:region-before | fo:region-after">
+  <xsl:call-template name="get-area-attributes"/>
+
+  <!-- For header and footer, we suppress margins and padding -->
+  <xsl:variable name="style">
+    <xsl:apply-templates select="@*[not (starts-with (name(), 'margin')                           or starts-with (name(), 'space')                           or starts-with (name(), 'padding'))]" mode="collect-style-attributes">
+      <xsl:with-param name="orientation" select="@reference-orientation"/>
+    </xsl:apply-templates>
+  </xsl:variable>
+
+  <xsl:if test="string-length($style) &gt; 0">
+    <xsl:attribute name="style"><xsl:value-of select="normalize-space($style)"/></xsl:attribute>
+  </xsl:if>
+
+</xsl:template>
+
+<xsl:template match="fo:region-body">
+  <xsl:call-template name="get-area-attributes"/>
+
+  <!-- For region-body, we suppress margin attributes -->
+  <xsl:variable name="style">
+    <xsl:apply-templates select="@*[not (starts-with (name(), 'margin')                           or starts-with (name(), 'space'))]" mode="collect-style-attributes">
+      <xsl:with-param name="orientation" select="@reference-orientation"/>
+    </xsl:apply-templates>
+  </xsl:variable>
+
+  <xsl:if test="string-length($style) &gt; 0">
+    <xsl:attribute name="style"><xsl:value-of select="normalize-space($style)"/></xsl:attribute>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template match="fo:region-start | fo:region-end"/>
+
+<xsl:template name="get-area-attributes">
+  <xsl:attribute name="valign">
+    <xsl:choose>
+      <xsl:when test="@display-align"><xsl:value-of select="@display-align"/></xsl:when>
+      <xsl:otherwise>top</xsl:otherwise>
+    </xsl:choose>
+  </xsl:attribute>
+</xsl:template>
+
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/vmap/vas/rest/conf/cadastre/version.inc b/src/module_cadastre/web_service/conf/version.inc
similarity index 100%
rename from vmap/vas/rest/conf/cadastre/version.inc
rename to src/module_cadastre/web_service/conf/version.inc
diff --git a/vmap/vas/rest/ws/cadastre/Adresse.class.inc b/src/module_cadastre/web_service/ws/Adresse.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/cadastre/Adresse.class.inc
rename to src/module_cadastre/web_service/ws/Adresse.class.inc
diff --git a/vmap/vas/rest/ws/cadastre/Adresses.class.inc b/src/module_cadastre/web_service/ws/Adresses.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/cadastre/Adresses.class.inc
rename to src/module_cadastre/web_service/ws/Adresses.class.inc
diff --git a/vmap/vas/rest/ws/cadastre/CHANGE_LOG.txt b/src/module_cadastre/web_service/ws/CHANGE_LOG.txt
similarity index 100%
rename from vmap/vas/rest/ws/cadastre/CHANGE_LOG.txt
rename to src/module_cadastre/web_service/ws/CHANGE_LOG.txt
diff --git a/vmap/vas/rest/ws/cadastre/Cadastre.class.inc b/src/module_cadastre/web_service/ws/Cadastre.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/cadastre/Cadastre.class.inc
rename to src/module_cadastre/web_service/ws/Cadastre.class.inc
diff --git a/vmap/vas/rest/ws/cadastre/CadastreProperties.class.inc b/src/module_cadastre/web_service/ws/CadastreProperties.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/cadastre/CadastreProperties.class.inc
rename to src/module_cadastre/web_service/ws/CadastreProperties.class.inc
diff --git a/vmap/vas/rest/ws/cadastre/Commune.class.inc b/src/module_cadastre/web_service/ws/Commune.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/cadastre/Commune.class.inc
rename to src/module_cadastre/web_service/ws/Commune.class.inc
diff --git a/vmap/vas/rest/ws/cadastre/Communes.class.inc b/src/module_cadastre/web_service/ws/Communes.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/cadastre/Communes.class.inc
rename to src/module_cadastre/web_service/ws/Communes.class.inc
diff --git a/vmap/vas/rest/ws/cadastre/DescriptionParcelle.class.inc b/src/module_cadastre/web_service/ws/DescriptionParcelle.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/cadastre/DescriptionParcelle.class.inc
rename to src/module_cadastre/web_service/ws/DescriptionParcelle.class.inc
diff --git a/vmap/vas/rest/ws/cadastre/DescriptionParcelles.class.inc b/src/module_cadastre/web_service/ws/DescriptionParcelles.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/cadastre/DescriptionParcelles.class.inc
rename to src/module_cadastre/web_service/ws/DescriptionParcelles.class.inc
diff --git a/vmap/vas/rest/ws/cadastre/DownloadRapport.class.inc b/src/module_cadastre/web_service/ws/DownloadRapport.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/cadastre/DownloadRapport.class.inc
rename to src/module_cadastre/web_service/ws/DownloadRapport.class.inc
diff --git a/vmap/vas/rest/ws/cadastre/FicheDescriptiveInvariant.class.inc b/src/module_cadastre/web_service/ws/FicheDescriptiveInvariant.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/cadastre/FicheDescriptiveInvariant.class.inc
rename to src/module_cadastre/web_service/ws/FicheDescriptiveInvariant.class.inc
diff --git a/vmap/vas/rest/ws/cadastre/FicheDescriptiveParcelle.class.inc b/src/module_cadastre/web_service/ws/FicheDescriptiveParcelle.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/cadastre/FicheDescriptiveParcelle.class.inc
rename to src/module_cadastre/web_service/ws/FicheDescriptiveParcelle.class.inc
diff --git a/vmap/vas/rest/ws/cadastre/FicheUrbanisme.class.inc b/src/module_cadastre/web_service/ws/FicheUrbanisme.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/cadastre/FicheUrbanisme.class.inc
rename to src/module_cadastre/web_service/ws/FicheUrbanisme.class.inc
diff --git a/vmap/vas/rest/ws/cadastre/Invariant.class.inc b/src/module_cadastre/web_service/ws/Invariant.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/cadastre/Invariant.class.inc
rename to src/module_cadastre/web_service/ws/Invariant.class.inc
diff --git a/vmap/vas/rest/ws/cadastre/Invariants.class.inc b/src/module_cadastre/web_service/ws/Invariants.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/cadastre/Invariants.class.inc
rename to src/module_cadastre/web_service/ws/Invariants.class.inc
diff --git a/vmap/vas/rest/ws/cadastre/LieuDit.class.inc b/src/module_cadastre/web_service/ws/LieuDit.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/cadastre/LieuDit.class.inc
rename to src/module_cadastre/web_service/ws/LieuDit.class.inc
diff --git a/vmap/vas/rest/ws/cadastre/LieuDits.class.inc b/src/module_cadastre/web_service/ws/LieuDits.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/cadastre/LieuDits.class.inc
rename to src/module_cadastre/web_service/ws/LieuDits.class.inc
diff --git a/vmap/vas/rest/ws/cadastre/Parcelle.class.inc b/src/module_cadastre/web_service/ws/Parcelle.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/cadastre/Parcelle.class.inc
rename to src/module_cadastre/web_service/ws/Parcelle.class.inc
diff --git a/vmap/vas/rest/ws/cadastre/Parcelles.class.inc b/src/module_cadastre/web_service/ws/Parcelles.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/cadastre/Parcelles.class.inc
rename to src/module_cadastre/web_service/ws/Parcelles.class.inc
diff --git a/vmap/vas/rest/ws/cadastre/Proprietaire.class.inc b/src/module_cadastre/web_service/ws/Proprietaire.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/cadastre/Proprietaire.class.inc
rename to src/module_cadastre/web_service/ws/Proprietaire.class.inc
diff --git a/vmap/vas/rest/ws/cadastre/Proprietaires.class.inc b/src/module_cadastre/web_service/ws/Proprietaires.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/cadastre/Proprietaires.class.inc
rename to src/module_cadastre/web_service/ws/Proprietaires.class.inc
diff --git a/vmap/vas/rest/ws/cadastre/RapportsCadastreParcelle.class.inc b/src/module_cadastre/web_service/ws/RapportsCadastreParcelle.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/cadastre/RapportsCadastreParcelle.class.inc
rename to src/module_cadastre/web_service/ws/RapportsCadastreParcelle.class.inc
diff --git a/vmap/vas/rest/ws/cadastre/ReleveDePropriete.class.inc b/src/module_cadastre/web_service/ws/ReleveDePropriete.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/cadastre/ReleveDePropriete.class.inc
rename to src/module_cadastre/web_service/ws/ReleveDePropriete.class.inc
diff --git a/vmap/vas/rest/ws/cadastre/Section.class.inc b/src/module_cadastre/web_service/ws/Section.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/cadastre/Section.class.inc
rename to src/module_cadastre/web_service/ws/Section.class.inc
diff --git a/vmap/vas/rest/ws/cadastre/Sections.class.inc b/src/module_cadastre/web_service/ws/Sections.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/cadastre/Sections.class.inc
rename to src/module_cadastre/web_service/ws/Sections.class.inc
diff --git a/vmap/vas/rest/ws/cadastre/Versions.class.inc b/src/module_cadastre/web_service/ws/Versions.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/cadastre/Versions.class.inc
rename to src/module_cadastre/web_service/ws/Versions.class.inc
diff --git a/vmap/vas/rest/ws/cadastre/Voie.class.inc b/src/module_cadastre/web_service/ws/Voie.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/cadastre/Voie.class.inc
rename to src/module_cadastre/web_service/ws/Voie.class.inc
diff --git a/vmap/vas/rest/ws/cadastre/Voies.class.inc b/src/module_cadastre/web_service/ws/Voies.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/cadastre/Voies.class.inc
rename to src/module_cadastre/web_service/ws/Voies.class.inc
diff --git a/vmap/vas/rest/ws/cadastre/overview.phtml b/src/module_cadastre/web_service/ws/overview.phtml
similarity index 100%
rename from vmap/vas/rest/ws/cadastre/overview.phtml
rename to src/module_cadastre/web_service/ws/overview.phtml
diff --git a/src/module_cadastreV2/README.md b/src/module_cadastreV2/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..ec2a6305a6af85a9fbcb9e0f035468a4e0c9ab19
--- /dev/null
+++ b/src/module_cadastreV2/README.md
@@ -0,0 +1 @@
+Web service SadastreV2
\ No newline at end of file
diff --git a/src/module_cadastreV2/web_service/CHANGE_LOG.txt b/src/module_cadastreV2/web_service/CHANGE_LOG.txt
new file mode 100755
index 0000000000000000000000000000000000000000..5f03f57c51d9e33e68408b3557c18671e3a78865
--- /dev/null
+++ b/src/module_cadastreV2/web_service/CHANGE_LOG.txt
@@ -0,0 +1,28 @@
+b23201|RELEASE	    |cadastreV2|	Version 2017.01.01
+b23201|BUG			|cadastreV2|	UPDATE pb vue v_vmap_objet_surfacique_divers
+b22780|BUG			|cadastreV2|	guillemets
+b22774|BUG			|cadastreV2|	Bug fiche invariant
+b22727|BUG			|cadastreV2|	Bug privilèges
+b22647|EVOLUTION	|cadastreV2|	Tous les constructeurs des classes PHP ont été renommé en __construct
+b22501|BUG			|cadastreV2|	Accès à la documentation du web service cadastreV2
+b22452|EVOLUTION	|cadastreV2|	properties_selected -> selected_properties
+b22354|BUG			|cadastreV2|	Affichage des properties définies dans les fichiers properties_selected.inc
+b22137|RELEASE	    |cadastreV2|	Version 2017.01.00
+b21826|BUG			|cadastreV2|	Ajout de restriction communale pour des vues du schéma s_cadastre
+b21360|BUG			|cadastreV2|	Modif sur la table pdl_20_assise_pdl pour passer l'attribut kass à 14 caractères (et faire la liaison avec les parcelles)
+b21249|BUG			|cadastreV2|	Ajout des restrictions communales sur les vues relatives aux objets surfacique et aux cours d'eau
+b21185|BUG			|cadastreV2|	projections cadastre
+b20815|BUG			|cadastreV2|	maj pour supprimer le not null sur certains champs de s_majic et convertir des char en varchar
+b20685|BUG			|cadastreV2|	fiche urb map_id
+b20564|BUG			|cadastreV2|	Correction erreur code SQL
+b20498|EVOLUTION	|cadastreV2|	Ajout de l'adresse de la parcelle dans la fiche d'urbanisme
+b20497|EVOLUTION	|cadastreV2|	Ajout Adresse de la parcelle fiche urbanisme
+b20494|EVOLUTION	|cadastreV2|	Ajout de l'adresse de la parcelle dans la fiche d'urbanisme
+b20274|BUG			|cadastreV2|	Template Fiche Urb
+b20269|EVOLUTION	|cadastreV2|	Impressions PhantomJS
+b19740|BUG			|cadastreV2|	Ajout de clefs primaires dans les schémas s_cadastre et s_majic
+b19732|BUG			|cadastreV2|	Correction pb génération rapports
+b19624|BUG			|cadastreV2|	Suppression de l'insertion du template fiche urbanisme
+b18525|BUG			|cadastreV2|	passage owner de postgres à u_vitis
+b18366|BUG			|cadastreV2|	st_area -> public.st_area
+b18243|BUG			|cadastreV2|	Utilisation EWKT
diff --git a/src/module_cadastreV2/web_service/_install/apache.conf b/src/module_cadastreV2/web_service/_install/apache.conf
new file mode 100755
index 0000000000000000000000000000000000000000..e6782d5781e1508181e74bda92ef8918dab04900
--- /dev/null
+++ b/src/module_cadastreV2/web_service/_install/apache.conf
@@ -0,0 +1,4 @@
+
+	<Directory "[VASDIRECTORY]/public/cadastreV2">
+		Require all denied
+	</Directory>
\ No newline at end of file
diff --git a/src/module_cadastreV2/web_service/_install/dependency.xml b/src/module_cadastreV2/web_service/_install/dependency.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7c49bafb8090caf461f02d945cbd77b8c705b1d2
--- /dev/null
+++ b/src/module_cadastreV2/web_service/_install/dependency.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- WS cadastreV2 -->
+<installer>
+	<schema>
+		<name>s_cadastre</name>
+		<version>2018.02.01</version>
+		<dependenciesCollection>
+			<dependency>
+				<nature>schema</nature>
+				<name>s_vmap</name>
+				<version>2018.03.00</version>
+				<object>vmap</object>
+			</dependency>
+			<dependency>
+				<name>postgis</name>
+				<version>2.0</version>
+				<nature>extern-pre</nature>
+			</dependency>
+		</dependenciesCollection>
+	</schema>
+	<dependenciesCollection>
+		<dependency>
+			<nature>vas</nature>
+			<version>2018.05.00</version>
+		</dependency>
+		<dependency>
+			<nature>web_services</nature>
+			<name>vmap</name>
+			<version>2018.03.00</version>
+		</dependency>
+		<dependency>
+			<name>jre</name>
+			<nature>extern-post</nature>
+			<location>jre-8u101</location>
+		</dependency>
+		<dependency>
+			<name>fop</name>
+			<nature>extern-post</nature>
+			<location>fop-2.0</location>
+		</dependency>
+	</dependenciesCollection>
+</installer>
diff --git a/src/module_cadastreV2/web_service/class/majic_libV2/CHANGE_LOG.txt b/src/module_cadastreV2/web_service/class/majic_libV2/CHANGE_LOG.txt
new file mode 100755
index 0000000000000000000000000000000000000000..39048bfeabdf4b48d273be99b7e2596b028b4617
--- /dev/null
+++ b/src/module_cadastreV2/web_service/class/majic_libV2/CHANGE_LOG.txt
@@ -0,0 +1,11 @@
+
+              +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+              +                                                                                   +
+              +                   VEREMES - changelog de Majic_lib		                  +
+              +                                                                                   +
+              +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+
+__________________________________________________________________________________________________________________
+|b4379|NOUVEAUTE   |RELEASE| VERSION 2011.1 Rajout du champ TAXE AD qui correspond aux taxes additionnelles sur les parcelles. Cette mise � jour s'applique sur la version 2011 applicable sur les donn�es 2012 
+|
diff --git a/src/module_cadastreV2/web_service/class/majic_libV2/Mj.class.inc b/src/module_cadastreV2/web_service/class/majic_libV2/Mj.class.inc
new file mode 100755
index 0000000000000000000000000000000000000000..c73e94702e733a03a02d93d2a100845020777297
--- /dev/null
+++ b/src/module_cadastreV2/web_service/class/majic_libV2/Mj.class.inc
@@ -0,0 +1,121 @@
+<?php
+
+/**
+ * \file Mj.class.inc
+ * \brief Mj.class.inc \n \n Ce fichier contient la classe php Mj.
+ * 
+ * Cette classe est une classe virtuelle qui peut être appelé par les autres classes de la librairie majic_lib par héritage.
+ *
+ * \author Damien Bedel <damien.bedel@veremes.com>
+ * \author Olivier Gayte <olivier.gayte@veremes.com>
+ */
+/**
+ * \class Mj
+ * \brief Mj Class \n \n Mj est une classe PHP.
+ * 
+ * Cette classe permet de retourner un objet de sélection dans une table sous la forme d'un tableau HTML.
+ *
+ * \author Damien Bedel
+ * \author Olivier Gayte <olivier.gayte@veremes.com>
+ */
+require_once __DIR__ . "/../vitis_lib/XmlAbstract.class.inc";
+
+
+
+class Mj extends XmlAbstract {
+
+    /**
+     * Requête SQL de sélection dans la table.
+     */
+    var $sSql;
+
+    /**
+     * Statut de l'objet crée lors de la requête. 1 si erreur; 0 si l'objet a pu être instancié.
+     */
+    var $sStatus = 0;
+
+    /**
+     * Message d'erreur.
+     */
+    var $sMessage;
+
+    /**
+     * Nom du fichier SQL.
+     */
+    var $sRessourcesFile = 'Mj.sql.inc';
+
+    /**
+     * Clef de cryptage
+     */
+    var $sEncryptKey = '';
+
+    /**
+     * Clef de cryptage
+     */
+    var $bAllSuf = false;
+                    
+    /**
+     * Cette méthode permet de retourner un code d'erreur en fonction du statut de l'objet résultant de la sélection.
+     * \return Retourne 1 s'il y a une erreur, 0 si ok.
+     */
+    function isError() {
+        if ($this->sStatus == 1) {
+            return 1;
+        } else {
+            return 0;
+        }
+    }
+
+    /**
+     * Cette méthode permet de renvoyer un message d'erreur.
+     * \return Retourne une chaîne de caractères.
+     */
+    function getMessage() {
+        return $this->sMessage;
+    }
+
+    function encrypt($cleartext) {
+        if ($this->sEncryptKey != '') {
+            if (empty($cleartext) || USE_ENCRYPTION == false) {
+                return $cleartext;
+            }
+            $cipher = mcrypt_module_open(MCRYPT_BLOWFISH, '', MCRYPT_MODE_CBC, '');
+            $key = substr($this->sEncryptKey, 0, mcrypt_enc_get_key_size($cipher));
+            $iv = '00000000';
+
+            // add the padding.
+            $cleartext_length = strlen($cleartext) % 8;
+            for ($i = $cleartext_length; $i < 8; $i++) {
+                $cleartext .= chr(8 - $cleartext_length);
+            }
+
+            $ciphertext = '';
+            // 128-bit Blowfish encryption:
+            if (mcrypt_generic_init($cipher, $key, $iv) != - 1) {
+                // PHP pads with NULL bytes if $cleartext IS NOT a multiple of the block size ..
+                if (empty($cleartext)) {
+                    return '';
+                }
+                $ciphertext = mcrypt_generic($cipher, $cleartext);
+                mcrypt_generic_deinit($cipher);
+            }
+
+            return base64_encode($ciphertext);
+        } else {
+            return $cleartext;
+        }
+    }
+
+    function getObjects($sClasse) {
+        $aObjClass = array();
+        foreach ($this->aObjects as $oObj) {
+            if (get_class($oObj) == $sClasse) {
+                array_push($aObjClass, $oObj);
+            }
+        }
+        return $aObjClass;
+    }
+
+}
+
+?>
\ No newline at end of file
diff --git a/src/module_cadastreV2/web_service/class/majic_libV2/Mj.sql.inc b/src/module_cadastreV2/web_service/class/majic_libV2/Mj.sql.inc
new file mode 100755
index 0000000000000000000000000000000000000000..523be1a64b6139fc6cafbbf4a9c3f1aa3f31b0f3
--- /dev/null
+++ b/src/module_cadastreV2/web_service/class/majic_libV2/Mj.sql.inc
@@ -0,0 +1,124 @@
+<?php
+
+
+$aSql['pgsql']['proprietaire']= 'SELECT  id_dnupro, dnupro, id_pro, l_ccodro, l_ccodem, dnuper, dqualp, ddenom, dnomlp, dprnlp, epxnee, dnomcp, dprncp, jdatnss, dldnss, dlign3, dlign4, dlign5, dlign6, gtoper FROM s_majic.proprietaire LEFT JOIN s_majic.tc_ccodro_code_droit ON proprietaire.ccodro=tc_ccodro_code_droit.ccodro LEFT JOIN s_majic.tc_ccodem_nature_demembrement ON proprietaire.ccodem=tc_ccodem_nature_demembrement.ccodem WHERE id_dnupro=\'$sIdDnupro\' AND id_pro=\'$sIdPro\'';
+$aSql['pgsql']['bati'] = 'SELECT fantoir_commune.libcom, bati_0010_local.dnbniv, bati_0010_local.jdatat, bati_0010_local.jannat, bati_0010_local.dnatlc, bati_0010_local.id_dnupro as b_iddnupro, bati_0010_local.dnupro as b_dnupro, bati_0010_local.id_local, bati_0010_local.dteloc, tc_dteloc_type_local.dteloc, bati_0010_local.dvltrt, jdatat, ccosec, dnupla, ccoplc, dnvoiri, dindic,  dvoilib, ccoriv,  dnubat, nesc, dniv, dpor, bati_0010_local. invar, ccoeva, bati_0010_local.cconlc, l_cconlc, dvlpera, gtauom, cconad,	lot_local.dnumql, lot_local.ddenql FROM s_majic.bati_0010_local LEFT JOIN s_majic.bati_60_descr_dep ON bati_0010_local.id_local=bati_60_descr_dep.id_local LEFT JOIN s_majic.bati_21_pev_descr ON bati_0010_local.id_local=bati_21_pev_descr.id_local  LEFT JOIN s_majic.tc_dteloc_type_local ON bati_0010_local.dteloc=tc_dteloc_type_local.dteloc LEFT JOIN s_majic.lot_local ON bati_0010_local.id_local=lot_local.id_local LEFT JOIN s_majic.fantoir_commune ON bati_0010_local.ccocom=fantoir_commune.ccocom LEFT JOIN s_majic."tc_cconlc_nature_local" ON bati_0010_local.cconlc="tc_cconlc_nature_local".cconlc WHERE bati_0010_local.id_local=\'$sIdBat\' ORDER BY ccosec, dnupla, bati_0010_local.invar';
+$aSql['pgsql']['habit_descr'] = 'SELECT dnupev,  invar, cconad1, cconad2, cconad3, cconad4, dsueic1,  dsueic2, dsueic3, dsueic4, geaulc, gelelc, gesclc, ggazlc, gasclc, gchclc, gvorlc, gteglc, dnbbai, dnbdou,  dnblav, dnbwc, dnbppr, dnbsam, dnbcha, dnbcu8, dnbcu9, dnbsea, dnbann, dnbpdc, dsupdc, dmagtm, dmatto,  jannat, detent,  dnbniv FROM s_majic.bati_40_descr_hab WHERE id_pev=\'$sIdPev\' AND dnudes=\'$sDnudes\'';
+$aSql['pgsql']['depend_descr'] = 'SELECT dnudes, dnupev,  invar, bati_60_descr_dep.cconad, tc_cconad_nature_dependance.l_cconad, dsudep, dcimlc, geaulc, geaulc, gelelc, gchclc, dnbbai, dnbdou,  dnblav, dnbwc, dmatgm, dmatto, detent FROM s_majic.bati_60_descr_dep INNER JOIN s_majic.tc_cconad_nature_dependance ON bati_60_descr_dep.cconad=tc_cconad_nature_dependance.cconad WHERE id_dep=\'$sIdDep\'';
+$aSql['pgsql']['prof_descr'] = 'SELECT dnudes, dnupev,  invar, vsurzt  FROM s_majic.bati_50_descr_pro WHERE id_pev=\'$sIdPev\'';
+$aSql['pgsql']['pev'] = 'SELECT bati_21_pev_descr.id_pev as id_pev, ccostb, ccoaff, dcapec, dcsglc,  bipevla1, gnexpl, dvlpera, bati_21_pev_descr.dnupev, bati_21_pev_descr.dvlper, bati_21_pev_descr.dnuref FROM s_majic.bati_21_pev_descr LEFT JOIN s_majic.bati_36_pev_tax ON bati_21_pev_descr.id_pev=bati_36_pev_tax.id_pev WHERE bati_21_pev_descr.id_pev=\'$sIdPev\'';
+$aSql['pgsql']['parcelle']='SELECT  id_par,  jdatat, ccosec, dnupla, dnvoiri, dindic, cconvo,  dvoilib,typevoie, ccoriv, dparpi, gparnf, dcntpa, dnupro , gparbat FROM s_majic.nb_10_parcelle LEFT JOIN s_majic.fantoir_voie ON nb_10_parcelle.id_voie=fantoir_voie.id_voie WHERE id_par=\'$sIdPar\'';
+$aSql['pgsql']['suf']='SELECT dnupro,nb_21_suf_descr.ccodep || nb_21_suf_descr.ccocom || nb_21_suf_descr.dnupro as id_dnupro , id_suf, gnexps, ccostn, ccosub,nb_21_suf_descr.dsgrpf, l_dsgrpf, dclssf, cnatsp, dcntsf, drcsuba, drcsub FROM s_majic.nb_21_suf_descr LEFT JOIN s_majic.tc_dsgrpf_sousgroupe_suf ON nb_21_suf_descr.dsgrpf = tc_dsgrpf_sousgroupe_suf.dsgrpf WHERE id_suf=\'$sIdSuf\'';
+$aSql['pgsql']['suf_bnd']='SELECT DISTINCT id_suf, dnupro,nb_21_suf_descr.ccodep || nb_21_suf_descr.ccocom || nb_21_suf_descr.dnupro as id_dnupro , gnexps, ccostn, ccosub,nb_21_suf_descr.dsgrpf as dsgrpf, l_dsgrpf, dclssf, cnatsp, dcntsf, drcsuba, drcsub, nb_21_suf_descr.dnupdl, nb_21_suf_descr.dnulot, dnumql, ddenql FROM (s_majic.nb_21_suf_descr LEFT JOIN s_majic.tc_dsgrpf_sousgroupe_suf ON nb_21_suf_descr.dsgrpf = tc_dsgrpf_sousgroupe_suf.dsgrpf) LEFT JOIN s_majic.pdl_30_descr_lot ON pdl_30_descr_lot.klot=nb_21_suf_descr.klot WHERE id_suf=\'$sIdSuf\'';
+$aSql['pgsql']['suf_dnupro']='SELECT nb_21_suf_descr.dnupro FROM s_majic.nb_10_parcelle RIGHT JOIN s_majic.nb_21_suf_descr ON nb_10_parcelle.id_par=nb_21_suf_descr.id_par WHERE id_suf=\'$sIdSuf\'';
+$aSql['pgsql']['compte_communal']='SELECT proprietaire.ccodep, proprietaire.ccodir, proprietaire.ccocom,  libcom, dnupro,  id_dnupro FROM s_majic.proprietaire LEFT JOIN s_majic.fantoir_commune ON proprietaire.id_com=fantoir_commune.id_com WHERE id_dnupro=\'$sIdDnupro\'';
+$aSql['pgsql']['bati_parcelle']='SELECT  id_par, proprietaire.ccodep, proprietaire.ccodir, proprietaire.ccocom,  libcom, proprietaire.dnupro, proprietaire.id_dnupro, nb_10_parcelle.dnvoiri, nb_10_parcelle.dindic, cconvo, dvoilib, dcntpa FROM s_majic.nb_10_parcelle INNER JOIN s_majic.proprietaire ON nb_10_parcelle.id_dnupro=proprietaire.id_dnupro LEFT JOIN s_majic.fantoir_commune ON nb_10_parcelle.id_com=fantoir_commune.id_com WHERE id_par=\'sIdPar\''; 
+$aSql['pgsql']['exone_pev']='SELECT id_ex, ccolloc, gnextl, janimp, jandeb, rcexba2, pexb FROM s_majic.bati_30_pev_exo WHERE id_ex=\'$sIdEx\'';
+$aSql['pgsql']['exon_suf']='SELECT id_suf, rnuexn, ccolloc, gnexts, jfinex, pexn, rcexnba FROM s_majic.nb_30_suf_exo WHERE id_suf=\'$sIdSuf\' and rnuexn=\'$sRnuexn\'';
+$aSql['pgsql']['lot_local']='SELECT id_local , klot, dnupdl, dnulot, dnumql, ddenql FROM s_majic.lot_local WHERE id_local=\'$sIdBat\' and klot"=\'$sKlot\'';
+$aSql['pgsql']['get_id_pev']='SELECT id_pev FROM s_majic.bati_21_pev_descr WHERE id_local=\'$sIdBat\' ORDER BY id_pev';
+$aSql['pgsql']['get_id_ex_pev']='SELECT id_ex FROM s_majic.bati_30_pev_exo WHERE id_pev=\'$sIdPev\' ORDER BY id_ex';
+$aSql['pgsql']['get_id_descr_hab']='SELECT dnudes, id_pev as id_pev FROM s_majic.bati_40_descr_hab WHERE id_pev=\'$sIdPev\' ORDER BY dnudes';
+$aSql['pgsql']['get_id_descr_depend']='SELECT id_dep FROM s_majic.bati_60_descr_dep WHERE id_pev=\'$sIdPev\' ORDER BY "id_dep"';
+$aSql['pgsql']['get_klot']='SELECT klot FROM s_majic.lot_local WHERE id_local=\'$sIdBat\' ORDER BY klot';
+$aSql['pgsql']['get_id_suf']='SELECT id_suf FROM s_majic.nb_10_parcelle RIGHT JOIN s_majic.nb_21_suf_descr ON nb_10_parcelle.id_par=nb_21_suf_descr.id_par WHERE (nb_10_parcelle.dnupro=\'sDnupro\' OR nb_21_suf_descr.dnupro=\'sDnupro\') AND nb_21_suf_descr.id_par=\'sIdPar\' AND (nb_10_parcelle.id_dnupro=\'sIdDnupro\' OR nb_21_suf_descr.dnupro=\'sDnupro\')';
+$aSql['pgsql']['get_rnuexn']='SELECT DISTINCT rnuexn FROM s_majic.nb_30_suf_exo WHERE id_suf=\'$sIdSuf\' ORDER BY rnuexn';
+$aSql['pgsql']['get_id_pro']='SELECT DISTINCT id_pro FROM s_majic.proprietaire WHERE id_dnupro=\'$sIdDnupro\' ORDER BY id_pro';
+$aSql['pgsql']['get_id_bat']='SELECT id_local FROM s_majic.bati_0010_local WHERE id_dnupro=\'$sIdDnupro\' ORDER BY id_local';
+$aSql['pgsql']['get_id_par']='SELECT DISTINCT nb_10_parcelle.id_par FROM s_majic.nb_10_parcelle LEFT JOIN s_majic.nb_21_suf_descr ON nb_10_parcelle.id_par=nb_21_suf_descr.id_par WHERE (nb_10_parcelle.dnupro=\'$sDnupro\' OR nb_21_suf_descr.dnupro=\'$sDnupro\') AND nb_21_suf_descr.id_com=\'$sIdCom\' ORDER BY nb_10_parcelle.id_par';
+$aSql['pgsql']['get_id_par_bnd']='SELECT nb_10_parcelle.id_par FROM s_majic.nb_21_suf_descr INNER JOIN s_majic.nb_10_parcelle ON nb_21_suf_descr.id_par = nb_10_parcelle.id_par WHERE nb_21_suf_descr.dnupro = \'$sDnupro\' AND nb_10_parcelle.id_dnupro != \'$sIdDnupro\' AND nb_10_parcelle.id_com=\'sIdCom\'';
+$aSql['pgsql']['get_par_id_bat']='SELECT id_local as id_bat FROM s_majic.bati_0010_local WHERE id_par=\'sIdPar\' ORDER BY id_local';
+$aSql['pgsql']['annee_reference']='SELECT annee FROM s_majic.annee_reference';
+$aSql['pgsql']['get_id_dnupro']='SELECT  id_dnupro as iddnupro, dnupro FROM s_majic.nb_10_parcelle WHERE id_par=\'idparpro\'';
+$aSql['pgsql']['compte_communal_parcelle']='SELECT proprietaire.ccodep , libdep, proprietaire.ccodir, proprietaire.ccocom ,  libcom, proprietaire.dnupro, proprietaire.id_dnupro,  id_par FROM s_majic.nb_10_parcelle, s_majic.proprietaire LEFT JOIN s_majic.fantoir_commune ON proprietaire.id_com=fantoir_commune.id_com LEFT JOIN s_majic.fantoir_direction ON fantoir_commune.ccodep= fantoir_direction.ccodep WHERE proprietaire.id_dnupro=\'$sIdDnupro\' and id_par=\'$sIdPar\''; 
+$aSql['pgsql']['get_id_bat_parcelle']='SELECT id_local as id_bat FROM s_majic.bati_0010_local WHERE id_dnupro=\'$sIdDnupro\' and id_par=\'$sIdPar\' ORDER BY id_local';
+/*$aSql['pgsql']['emprise']['bati']='SELECT  id_par,  jdatat, ccosec, dnupla, dnvoiri, dindic, cconvo,  dvoilib, ccoriv, dparpi, gparnf, dcntpa, dnupro FROM s_majic.nb_10_parcelle WHERE id_par=\'$sIdPar\'';
+$aSql['pgsql']['emprise']['pos']='SELECT  id_par,  jdatat, ccosec, dnupla, dnvoiri, dindic, cconvo,  dvoilib, ccoriv, dparpi, gparnf, dcntpa, dnupro FROM s_majic.nb_10_parcelle WHERE id_par=\'$sIdPar\'';
+$aSql['pgsql']['emprise']['plu']='SELECT  id_par,  jdatat, ccosec, dnupla, dnvoiri, dindic, cconvo,  dvoilib, ccoriv, dparpi, gparnf, dcntpa, dnupro FROM s_majic.nb_10_parcelle WHERE id_par=\'$sIdPar\'';
+*/
+
+
+
+
+
+
+
+
+
+$aSql['oci']['proprietaire']= 'SELECT  id_dnupro, dnupro, id_pro, l_ccodro, l_ccodem, dnuper, dqualp, ddenom, dnomlp, dprnlp, epxnee, dnomcp, dprncp, TO_CHAR(jdatnss , \'DD/MM/YYYY\') as "jdatnss", dldnss, dlign3, dlign4, dlign5, dlign6, gtoper FROM s_majic.proprietaire LEFT JOIN s_majic.tc_ccodro_code_droit ON proprietaire.ccodro=tc_ccodro_code_droit.ccodro LEFT JOIN s_majic.tc_ccodem_nature_demembrement ON proprietaire.ccodem=tc_ccodem_nature_demembrement.ccodem WHERE id_dnupro=\'$sIdDnupro\' AND id_pro=\'$sIdPro\'';
+$aSql['oci']['bati'] = 'SELECT fantoir_commune.libcom, bati_0010_local. dnbniv, TO_CHAR(bati_0010_local.jdatat , \'DD/MM/YYYY\') as "jdatat", bati_0010_local.jannat, bati_0010_local.dnatlc, bati_0010_local.id_dnupro, bati_0010_local.dnupro as "b_dnupro", bati_0010_local.id_local as "id_local", bati_0010_local.dteloc, tc_dteloc_type_local.dteloc, bati_0010_local.dvltrt, ccosec, dnupla, ccoplc, dnvoiri, dindic,  dvoilib, ccoriv, dnubat, nesc, dniv, dpor, bati_0010_local.invar, ccoeva, tc_cconlc_nature_local.cconlc as cconlc, dvlpera, gtauom, cconad, lot_local.id_local as "Local_id_bat",lot_local.dnumql,lot_local.ddenql, l_cconlc FROM s_majic.bati_0010_local LEFT JOIN s_majic.bati_60_descr_dep ON bati_0010_local.id_local=bati_60_descr_dep.id_local LEFT JOIN s_majic.bati_21_pev_descr ON bati_0010_local.id_local=bati_21_pev_descr.id_local  LEFT JOIN s_majic.tc_dteloc_type_local ON bati_0010_local.dteloc=tc_dteloc_type_local.dteloc left JOIN s_majic.lot_local on bati_0010_local.id_local =lot_local.id_local left JOIN s_majic.fantoir_commune on bati_0010_local.id_com =fantoir_commune.id_com LEFT JOIN s_majic.tc_cconlc_nature_local ON bati_0010_local.cconlc=tc_cconlc_nature_local.cconlc  WHERE bati_0010_local.id_local=\'$sIdBat\' ORDER BY ccosec, dnupla,bati_0010_local.invar';
+$aSql['oci']['habit_descr'] = 'SELECT dnupev,  invar, cconad1, cconad2, cconad3, cconad4, dsueic1,  dsueic2, dsueic3, dsueic4, geaulc, gelelc, gesclc, ggazlc, gasclc, gchclc, gvorlc, gteglc, dnbbai, dnbdou,  dnblav, dnbwc, dnbppr, dnbsam, dnbcha, dnbcu8, dnbcu9, dnbsea, dnbann, dnbpdc, dsupdc,tc_dmatgm_materiaux_gros_murs.dmatgm, tc_dmatto_materiaux_toitures.dmatto, jannat, bati_40_descr_hab.detent, l_detent,  dnbniv, tc_dmatgm_materiaux_gros_murs.l_dmatgm, tc_dmatto_materiaux_toitures.l_dmatto FROM s_majic.bati_40_descr_hab LEFT JOIN s_majic.tc_detent_etat_entretien ON bati_40_descr_hab.detent=tc_detent_etat_entretien.detent LEFT JOIN s_majic.tc_dmatgm_materiaux_gros_murs ON bati_40_descr_hab.dmatgm=tc_dmatgm_materiaux_gros_murs.dmatgm LEFT JOIN s_majic.tc_dmatto_materiaux_toitures ON bati_40_descr_hab.dmatto=tc_dmatto_materiaux_toitures.dmatto WHERE id_pev=\'$sIdPev\'';
+$aSql['oci']['depend_descr'] = 'SELECT dnudes, dnupev, invar, cconad, dsudep, dcimlc, geaulc, gelelc, gchclc, dnbbai, dnbdou,  dnblav, dnbwc, tc_dmatgm_materiaux_gros_murs.dmatgm, tc_dmatto_materiaux_toitures.dmatto, bati_60_descr_dep.detent, l_detent, tc_dmatgm_materiaux_gros_murs.l_dmatgm, tc_dmatto_materiaux_toitures.l_dmatto  FROM s_majic.bati_60_descr_dep LEFT JOIN s_majic.tc_detent_etat_entretien ON bati_60_descr_dep.detent=tc_detent_etat_entretien.detent LEFT JOIN s_majic.tc_dmatgm_materiaux_gros_murs ON bati_60_descr_dep.dmatgm=tc_dmatgm_materiaux_gros_murs.dmatgm LEFT JOIN s_majic.tc_dmatto_materiaux_toitures ON bati_60_descr_dep.dmatto=tc_dmatto_materiaux_toitures.dmatto WHERE id_pev=\'$sIdPev\'';
+$aSql['oci']['prof_descr'] = 'SELECT dnudes, dnupev,  invar, vsurzt  FROM s_majic.bati_50_descr_pro WHERE id_pev=\'$sIdPev\'';
+$aSql['oci']['pev'] = 'SELECT  bati_21_pev_descr.id_pev as id_pev, ccostb, bati_21_pev_descr.ccoaff, l_ccoaff, dcapec, dcsglc, bipevla1, bati_21_pev_descr.gnexpl, l_gnexpl, dvlpera, bati_21_pev_descr.dnupev, bati_21_pev_descr.dvlper, bati_21_pev_descr.dnuref FROM s_majic.bati_21_pev_descr LEFT JOIN s_majic.tc_ccoaff_affectation_pev ON bati_21_pev_descr.ccoaff=tc_ccoaff_affectation_pev.ccoaff LEFT JOIN s_majic.tc_gnexpl_exoneration_permanente ON bati_21_pev_descr.gnexpl=tc_gnexpl_exoneration_permanente.gnexpl LEFT JOIN s_majic.bati_36_pev_tax ON bati_21_pev_descr.id_pev=bati_36_pev_tax.id_pev WHERE bati_21_pev_descr.id_pev=\'$sIdPev\'';
+$aSql['oci']['parcelle']='SELECT  id_par,  jdatat, ccosec, dnupla, dnvoiri, dindic,  codevoie, libvoie,typevoie, ccoriv, dparpi, gparnf, Ltrim(TO_CHAR(DCNTPA, \'000000000\')) as dcntpa, dnupro, gparbat, gurbpa FROM s_majic.nb_10_parcelle LEFT JOIN s_majic.fantoir_voie ON nb_10_parcelle.id_voie=fantoir_voie.id_voie WHERE id_par=\'$sIdPar\' ORDER BY ccosec,dnupla';
+$aSql['oci']['suf']='SELECT dnupro,nb_21_suf_descr.ccodep || nb_21_suf_descr.ccocom || nb_21_suf_descr.dnupro as id_dnupro , id_suf, gnexps, ccostn, ccosub,nb_21_suf_descr.dsgrpf as dsgrpf, l_dsgrpf, dclssf, cnatsp, Ltrim(TO_CHAR(dcntsf, \'000000000\')) as dcntsf, drcsuba, drcsub,nb_21_suf_descr.cgrnum, l_cgrnum FROM s_majic.nb_21_suf_descr LEFT JOIN s_majic.tc_dsgrpf_sousgroupe_suf ON nb_21_suf_descr.dsgrpf = tc_dsgrpf_sousgroupe_suf.dsgrpf LEFT JOIN s_majic.tc_cgrnum_groupe_numerique ON nb_21_suf_descr.cgrnum = tc_cgrnum_groupe_numerique.cgrnum WHERE id_suf=\'$sIdSuf\'';
+$aSql['oci']['suf_bnd']='SELECT DISTINCT id_suf,nb_21_suf_descr.ccodep || nb_21_suf_descr.ccocom || nb_21_suf_descr.dnupro as id_dnupro , dnupro, gnexps, ccostn, ccosub, nb_21_suf_descr.dsgrpf, l_dsgrpf, dclssf, cnatsp, Ltrim(TO_CHAR(dcntsf, \'000000000\')) as dcntsf, drcsuba, drcsub, nb_21_suf_descr.dnupdl, nb_21_suf_descr.dnulot, dnumql, ddenql,nb_21_suf_descr.cgrnum, l_cgrnum FROM (s_majic.nb_21_suf_descr LEFT JOIN s_majic.tc_dsgrpf_sousgroupe_suf ON nb_21_suf_descr.dsgrpf = tc_dsgrpf_sousgroupe_suf.dsgrpf) LEFT JOIN s_majic.tc_cgrnum_groupe_numerique ON nb_21_suf_descr.cgrnum = tc_cgrnum_groupe_numerique.cgrnum LEFT JOIN s_majic.pdl_30_descr_lot ON pdl_30_descr_lot.klot=nb_21_suf_descr.klot WHERE id_suf=\'$sIdSuf\' AND dnupro = \'sIdDnupro\'';
+$aSql['oci']['suf_bnd_all']='SELECT DISTINCT id_suf, dnupro,nb_21_suf_descr.ccodep || nb_21_suf_descr.ccocom || nb_21_suf_descr.dnupro as id_dnupro , gnexps, ccostn, ccosub, nb_21_suf_descr.dsgrpf as dsgrpf, l_dsgrpf, dclssf, cnatsp, dcntsf, drcsuba, drcsub, dnupdl, dnulot, nb_21_suf_descr.cgrnum, l_cgrnum FROM s_majic.nb_21_suf_descr LEFT JOIN tc_dsgrpf_sousgroupe_suf ON nb_21_suf_descr.dsgrpf = tc_dsgrpf_sousgroupe_suf.dsgrpf LEFT JOIN tc_cgrnum_groupe_numerique ON nb_21_suf_descr.CGRNUM = tc_cgrnum_groupe_numerique.cgrnum WHERE id_suf=\'$sIdSuf\'';
+$aSql['oci']['suf_dnupro']='SELECT nb_21_suf_descr.ccodep || nb_21_suf_descr.ccocom || nb_21_suf_descr.dnupro as dnupro FROM s_majic.nb_10_parcelle RIGHT JOIN s_majic.nb_21_suf_descr ON nb_10_parcelle.id_par=nb_21_suf_descr.id_par WHERE id_suf=\'$sIdSuf\'';
+$aSql['oci']['compte_communal']='SELECT proprietaire.ccodep as ccodep, proprietaire.ccodir, proprietaire.ccocom as ccocom,  libcom, dnupro,  id_dnupro FROM s_majic.proprietaire LEFT JOIN s_majic.fantoir_commune ON proprietaire.id_com=fantoir_commune.id_com WHERE id_dnupro=\'$sIdDnupro\'';
+$aSql['oci']['exone_pev']='SELECT id_ex, ccolloc, gnextl, janimp, jandeb, rcexba2, pexb FROM s_majic.bati_30_pev_exo WHERE id_ex=\'$sIdEx\'';
+$aSql['oci']['exon_suf']='SELECT id_suf, rnuexn, ccolloc, gnexts, jfinex, pexn, rcexnba FROM s_majic.nb_30_suf_exo WHERE id_par=(substr(\'$sIdSuf\',0,15)) AND ccosub=(substr(\'$sIdSuf\',16)) and rnuexn=\'$sRnuexn\'';
+$aSql['oci']['lot_local']='SELECT id_local, klot, dnupdl, dnulot, dnumql, ddenql FROM s_majic.lot_local WHERE id_local=\'$sIdBat\' and klot"=\'$sKlot\'';
+$aSql['oci']['get_id_pev']='SELECT id_pev FROM s_majic.bati_21_pev_descr WHERE id_local=\'$sIdBat\' ORDER BY id_pev';
+$aSql['oci']['get_id_ex_pev']='SELECT id_ex FROM s_majic.bati_30_pev_exo WHERE id_pev=\'$sIdPev\' ORDER BY id_ex';
+$aSql['oci']['get_klot']='SELECT klot FROM s_majic.lot_local WHERE id_local=\'$sIdBat\' ORDER BY klot';
+$aSql['oci']['get_id_suf']='SELECT id_suf FROM s_majic.nb_10_parcelle RIGHT JOIN s_majic.nb_21_suf_descr ON nb_10_parcelle.id_par=nb_21_suf_descr.id_par WHERE (nb_10_parcelle.dnupro=\'sIdDnupro\' OR nb_21_suf_descr.dnupro=\'$sDnupro\') AND nb_21_suf_descr.id_par=\'$sIdPar\' AND (nb_10_parcelle.id_dnupro=\'$sIdDnupro\' OR nb_21_suf_descr."DNUPRO"=\'$sDnupro\')';
+$aSql['oci']['get_rnuexn']='SELECT DISTINCT rnuexn FROM s_majic.nb_30_suf_exo WHERE id_par=(substr(\'$sIdSuf\',0,15)) AND ccosub=(substr(\'$sIdSuf\',16)) ORDER BY rnuexn';
+$aSql['oci']['get_id_pro']='SELECT DISTINCT id_pro, dnuper FROM s_majic.proprietaire WHERE id_dnupro=\'$sIdDnupro\' ORDER BY dnuper';
+$aSql['oci']['get_id_bat']='SELECT id_local FROM s_majic.bati_0010_local WHERE id_dnupro=\'$sIdDnupro\' ORDER BY id_local';
+$aSql['oci']['get_id_par']='SELECT DISTINCT nb_10_parcelle.id_par FROM s_majic.nb_10_parcelle LEFT JOIN s_majic.nb_21_suf_descr ON nb_10_parcelle.id_par=nb_21_suf_descr.id_par WHERE (nb_10_parcelle.dnupro=\'$sDnupro\' OR nb_21_suf_descr.dnupro=\'$sDnupro\') AND nb_21_suf_descr.id_com=\'$sIdCom\' ORDER BY nb_10_parcelle.id_par';
+$aSql['oci']['get_id_par_bnd']='SELECT nb_10_parcelle.id_par FROM s_majic.nb_21_suf_descr INNER JOIN s_majic.nb_10_parcelle ON nb_21_suf_descr.id_par = nb_10_parcelle.id_par where nb_21_suf_descr.dnupro = \'$sDnupro\' AND nb_10_parcelle.id_dnupro != \'$sIdDnupro\' AND nb_10_parcelle.id_com=\'$sIdCom\'';
+$aSql['oci']['annee_reference']='SELECT annee FROM s_majic.annee_reference';
+$aSql['oci']['get_id_dnupro']='SELECT  id_dnupro, dnupro FROM s_majic.nb_10_parcelle WHERE id_par=\'$sidparpro\'';
+$aSql['oci']['compte_communal_parcelle']='SELECT fantoir_commune.id_com ,proprietaire.ccodep, libdep, proprietaire.ccodir, fantoir_commune.ccocom,  libcom, proprietaire.dnupro,proprietaire.id_dnupro, id_par FROM s_majic.nb_10_parcelle, s_majic.proprietaire LEFT JOIN s_majic.fantoir_commune ON proprietaire.id_com=fantoir_commune.id_com LEFT JOIN s_majic.fantoir_direction ON fantoir_commune.ccodep= fantoir_direction.ccodep WHERE proprietaire.id_dnupro=\'$sIdDnupro\' and id_par=\'$sIdPar\'';
+$aSql['oci']['get_id_bat_parcelle']='SELECT id_local as id_local FROM s_majic.bati_0010_local WHERE id_dnupro=\'$sIdDnupro\' and id_par=\'$sIdPar\' ORDER BY id_local';
+$aSql['oci']['get_par_id_bat']='SELECT id_local as id_local FROM s_majic.bati_0010_local WHERE id_par=\'sIdPar\' ORDER BY id_local';
+$aSql['oci']['pos_plu']='SELECT p.GGCODEIDENT, cos, ces, type, hauteur, libelle, SDO_GEOM.SDO_AREA (SDO_GEOM.SDO_INTERSECTION(z.GEOM, p.GEOM, 0.005),0.005) surface  FROM exp_pos.zpos_simpl z RIGHT join cadastre.parcelle_cadastrale_mixee p  ON SDO_RELATE (z.geom,p.geom, \'mask=CONTAINS+INSIDE+OVERLAPBDYINTERSECT+COVERS+COVEREDBY+EQUAL querytype=WINDOW\') = \'TRUE\'  AND z.codcom =p.codcom WHERE z.OBJECTID = \'$sObjectId\' AND p.PAR_ID = \'$sIdPar\' AND p.codcom = \'$sCodCom\' and SDO_GEOM.SDO_AREA (SDO_GEOM.SDO_INTERSECTION(z.GEOM, p.GEOM, 0.005),0.005) >2';
+$aSql['oci']['get_id_pos_plu']='SELECT z.OBJECTID  FROM exp_pos.zpos_simpl z, cadastre.parcelle_cadastrale_mixee p  WHERE SDO_RELATE (z.geom,p.geom, \'mask=CONTAINS+INSIDE+OVERLAPBDYINTERSECT+COVERS+COVEREDBY+EQUAL querytype=WINDOW`\') = \'TRUE\'  AND z.codcom=p.codcom AND p.PAR_ID = \'$sIdPar\' AND p.codcom = \'$sCodCom\'';
+$aSql['oci']['get_codcom']='SELECT nb_10_parcelle.id_com FROM s_maJIC.nb_10_parcelle WHERE (nb_10_parcelle.id_par =\'$sIdPar\')';
+
+
+
+
+
+
+
+
+
+$aSql['sqlite']['proprietaire']= 'SELECT  id_dnupro, dnupro, id_pro, l_ccodro, l_ccodem, dnuper, dqualp, ddenom, dnomlp, dprnlp,epxnee, dnomcp, dprncp, jdatnss, dldnss, dlign3, dlign4, dlign5, dlign6, gtoper FROM s_majic.proprietaire LEFT JOIN s_majic.tc_ccodro_code_droit ON proprietaire.ccodro=tc_ccodro_code_droit.ccodro LEFT JOIN s_majic.tc_ccodem_nature_demembrement ON proprietaire.ccodem=tc_ccodem_nature_demembrement.ccodem WHERE id_dnupro=\'$sIdDnupro\' AND id_pro=\'$sIdPro\'';
+//modif pas faites sur autre database
+$aSql['sqlite']['bati'] = 'SELECT fantoir_commune.libcom, bati_0010_local.dnbniv, bati_0010_local.jdatat, bati_0010_local.jannat, bati_0010_local.dnatlc, bati_0010_local.id_dnupro, bati_0010_local.dnupro as b_dnupro, bati_0010_local.id_local as id_bat, bati_0010_local.dteloc, tc_dteloc_type_local.dteloc, bati_0010_local.dvltrt, jdatat, ccosec, dnupla, ccoplc, dnvoiri, dindic,  dvoilib, ccoriv, dnubat, nesc, dniv, dpor, bati_0010_local.invar, ccoeva, tc_cconlc_nature_local.cconlc, dvlpera, gtauom, cconad, lot_local.id_local as Local_id_bat, lot_local.dnumql, lot_local.ddenql, l_cconlc FROM s_majic.bati_0010_local LEFT JOIN s_majic.bati_60_descr_dep ON bati_0010_local.id_local=bati_60_descr_dep.id_local LEFT JOIN s_majic.bati_21_pev_descr ON bati_0010_local.id_local=bati_21_pev_descr.id_local  LEFT JOIN s_majic.tc_dteloc_type_local ON bati_0010_local.dteloc=tc_dteloc_type_local.dteloc LEFT JOIN s_majic.lot_local ON s_majic.bati_0010_local.id_local =lot_local.id_local LEFT JOIN s_majic.fantoir_commune ON s_majic.bati_0010_local.ccocom =fantoir_commune.ccocom LEFT JOIN s_majic.tc_cconlc_nature_local ON bati_0010_local.cconlc=tc_cconlc_nature_local.cconlc  WHERE bati_0010_local.id_local=\'$sIdBat\' ORDER BY ccosec, dnupla,bati_0010_local.invar';
+$aSql['sqlite']['habit_descr'] = 'SELECT dnupev,  invar, cconad1, cconad2, cconad3, cconad4, dsueic1,  dsueic2, dsueic3, dsueic4, geaulc, gelelc, gesclc, ggazlc, gasclc, gchclc, gvorlc, gteglc, dnbbai, dnbdou,  dnblav, dnbwc, dnbppr, dnbsam, dnbcha, dnbcu8, dnbcu9, dnbsea, dnbann, dnbpdc, dsupdc, tc_dmatgm_materiaux_gros_murs.dmatgm, tc_dmatto_materiaux_toitures.dmatto, jannat, bati_40_descr_hab.detent, l_detent,  dnbniv, tc_dmatgm_materiaux_gros_murs.l_dmatgm, tc_dmatto_materiaux_toitures.l_dmatto FROM s_majic.bati_40_descr_hab LEFT JOIN s_majic.tc_detent_etat_entretien ON bati_40_descr_hab.detent=tc_detent_etat_entretien.detent LEFT JOIN s_majic.tc_dmatgm_materiaux_gros_murs ON bati_40_descr_hab.dmatgm=tc_dmatgm_materiaux_gros_murs.dmatgm LEFT JOIN s_majic.tc_dmatto_materiaux_toitures ON bati_40_descr_hab.dmatto=tc_dmatto_materiaux_toitures.dmatto WHERE id_pev=\'$sIdPev\'';
+$aSql['sqlite']['depend_descr'] = 'SELECT dnudes, dnupev,  invar, cconad, dsudep, dcimlc, geaulc, geaulc, gelelc, gchclc, dnbbai, dnbdou,  dnblav, dnbwc, tc_dmatgm_materiaux_gros_murs.dmatgm, tc_dmatto_materiaux_toitures.dmatto, bati_60_descr_dep.detent, l_detent, tc_dmatgm_materiaux_gros_murs.l_dmatgm, tc_dmatto_materiaux_toitures.l_dmatto FROM s_majic.bati_60_descr_dep LEFT JOIN s_majic.tc_detent_etat_entretien ON bati_60_descr_dep.detent=tc_detent_etat_entretien.detent LEFT JOIN s_majic.tc_dmatgm_materiaux_gros_murs ON bati_60_descr_dep.dmatgm=tc_dmatgm_materiaux_gros_murs.dmatgm LEFT JOIN s_majic.tc_dmatto_materiaux_toitures ON bati_60_descr_dep.dmatto=tc_dmatto_materiaux_toitures.dmatto WHERE id_pev=\'$sIdPev\'';
+$aSql['sqlite']['prof_descr'] = 'SELECT dnudes, dnupev,  invar, vsurzt  FROM s_majic.bati_50_descr_pro WHERE id_pev=\'$sIdPev\'';
+$aSql['sqlite']['pev'] = 'SELECT  bati_21_pev_descr.id_pev as id_pev, ccostb, bati_21_pev_descr.ccoaff, l_ccoaff, dcapec, dcsglc,  bipevla1, bati_21_pev_descr.gnexpl, l_gnexpl, dvlpera, bati_21_pev_descr.dnupev, bati_21_pev_descr.dvlper, bati_21_pev_descr.dnuref FROM s_majic.bati_21_pev_descr LEFT JOIN s_majic.tc_ccoaff_affectation_pev ON bati_21_pev_descr.ccoaff=tc_ccoaff_affectation_pev.ccoaff LEFT JOIN s_majic.tc_gnexpl_exoneration_permanente ON bati_21_pev_descr.gnexpl=tc_gnexpl_exoneration_permanente.gnexpl LEFT JOIN s_majic.bati_36_pev_tax ON s_majic.bati_21_pev_descr.id_pev=bati_36_pev_tax.id_pev  WHERE bati_21_pev_descr.id_pev=\'$sIdPev\'';
+//fin modif
+$aSql['sqlite']['parcelle']='SELECT  id_par, jdatat, ccosec, dnupla, dnvoiri, dindic, codevoie, libvoie,typevoie, ccoriv, dparpi, gparnf, dcntpa, dnupro , gparbat FROM s_majic.nb_10_parcelle LEFT JOIN s_majic.fantoir_voie ON nb_10_parcelle.id_voie=fantoir_voie.id_voie WHERE id_par=\'$sIdPar\' ORDER BY ccosec,dnupla';
+//modif
+$aSql['sqlite']['suf']='SELECT DISTINCT dnupro,nb_21_suf_descr.ccodep || nb_21_suf_descr.ccocom || nb_21_suf_descr.dnupro as id_dnupro , id_suf, gnexps, ccostn, ccosub,nb_21_suf_descr.dsgrpf, l_dsgrpf, dclssf, cnatsp, dcntsf, drcsuba, drcsub, nb_21_suf_descr.cgrnum, l_cgrnum FROM s_majic.nb_21_suf_descr LEFT JOIN s_majic.tc_dsgrpf_sousgroupe_suf ON nb_21_suf_descr.dsgrpf = tc_dsgrpf_sousgroupe_suf.dsgrpf LEFT JOIN s_majic.tc_cgrnum_groupe_numerique ON nb_21_suf_descr.cgrnum = tc_cgrnum_groupe_numerique.cgrnum WHERE id_suf=\'$sIdSuf\'';
+$aSql['sqlite']['suf_bnd']='SELECT DISTINCT id_suf, dnupro, nb_21_suf_descr.ccodep || nb_21_suf_descr.ccocom || nb_21_suf_descr.dnupro as id_dnupro, gnexps, ccostn, ccosub, nb_21_suf_descr.dsgrpf, l_dsgrpf, dclssf, cnatsp, dcntsf, drcsuba, drcsub, dnupdl, dnulot, nb_21_suf_descr.cgrnum, l_cgrnum FROM s_majic.nb_21_suf_descr LEFT JOIN s_majic.tc_dsgrpf_sousgroupe_suf ON nb_21_suf_descr.dsgrpf = tc_dsgrpf_sousgroupe_suf.dsgrpf LEFT JOIN s_majic.tc_cgrnum_groupe_numerique ON nb_21_suf_descr.cgrnum = tc_cgrnum_groupe_numerique.cgrnum WHERE id_suf=\'$sIdSuf\' AND dnupro = \'sIdDnupro\'';
+$aSql['sqlite']['suf_bnd_all']='SELECT DISTINCT id_suf, dnupro, nb_21_suf_descr.ccodep || nb_21_suf_descr.ccocom || nb_21_suf_descr.dnupro as id_dnupro , gnexps, ccostn, ccosub, nb_21_suf_descr.dsgrpf, l_dsgrpf, dclssf, cnatsp, dcntsf, drcsuba, drcsub, dnupdl, dnulot, nb_21_suf_descr.cgrnum, l_cgrnum FROM s_majic.nb_21_suf_descr LEFT JOIN s_majic.tc_dsgrpf_sousgroupe_suf ON nb_21_suf_descr.dsgrpf = tc_dsgrpf_sousgroupe_suf.dsgrpf LEFT JOIN s_majic.tc_cgrnum_groupe_numerique ON nb_21_suf_descr.cgrnum = tc_cgrnum_groupe_numerique.cgrnum WHERE id_suf=\'$sIdSuf\'';
+//fin modif
+$aSql['sqlite']['compte_communal']='SELECT proprietaire.ccodep, proprietaire.ccodir, proprietaire.ccocom,  libcom, dnupro,  id_dnupro FROM s_majic.proprietaire LEFT JOIN s_majic.fantoir_commune ON proprietaire.id_com=fantoir_commune.id_com WHERE id_dnupro=\'$sIdDnupro\'';
+$aSql['sqlite']['exone_pev']='SELECT id_ex, ccolloc,  gnextl,  janimp,  jandeb, rcexba2, pexb FROM s_majic.bati_30_pev_exo WHERE id_ex=\'$sIdEx\'';
+$aSql['sqlite']['exon_suf']='SELECT id_suf, rnuexn, ccolloc, gnexts, jfinex, pexn, rcexnba FROM s_majic.nb_30_suf_exo WHERE id_suf=\'$sIdSuf\' and rnuexn=\'$sRnuexn\'';
+$aSql['sqlite']['lot_local']='SELECT id_local as id_bat, klot, dnupdl, dnulot FROM s_majic.lot_local WHERE id_local=\'$sIdBat\' and klot=\'$sKlot\'';
+$aSql['sqlite']['get_id_pev']='SELECT id_pev as id_pev FROM s_majic.bati_21_pev_descr WHERE id_local=\'$sIdBat\' ORDER BY id_pev';
+$aSql['sqlite']['get_id_ex_pev']='SELECT id_ex FROM s_majic.bati_30_pev_exo WHERE id_pev=\'$sIdPev\' ORDER BY id_ex';
+$aSql['sqlite']['get_klot']='SELECT klot FROM s_majic.lot_local WHERE id_local=\'$sIdBat\' ORDER BY klot';
+//modif
+$aSql['sqlite']['get_id_suf']='SELECT DISTINCT id_suf FROM s_majic.nb_21_suf_descr LEFT JOIN s_majic.nb_10_parcelle ON nb_10_parcelle.id_par=nb_21_suf_descr.id_par WHERE nb_21_suf_descr.id_par=\'$sIdPar\' AND (nb_10_parcelle.id_dnupro=\'$sIdDnupro\' OR nb_21_suf_descr.dnupro=\'$sDnupro\')';
+$aSql['sqlite']['suf_dnupro']='SELECT nb_21_suf_descr.ccodep || nb_21_suf_descr.ccocom || nb_21_suf_descr.dnupro as id_dnupro FROM s_majic.nb_21_suf_descr LEFT JOIN s_majic.nb_10_parcelle ON nb_10_parcelle.id_par=nb_21_suf_descr.id_par WHERE id_suf=\'$sIdSuf\'';
+//fin modif
+$aSql['sqlite']['get_rnuexn']='SELECT DISTINCT rnuexn FROM s_majic.nb_30_suf_exo WHERE id_suf=\'$sIdSuf\' ORDER BY rnuexn';
+$aSql['sqlite']['get_id_pro']='SELECT DISTINCT id_pro FROM s_majic.proprietaire WHERE id_dnupro=\'$sIdDnupro\' ORDER BY id_pro';
+$aSql['sqlite']['get_id_bat']='SELECT id_local as id_bat FROM s_majic.bati_0010_local WHERE id_dnupro=\'$sIdDnupro\' ORDER BY id_local';
+$aSql['sqlite']['get_id_par']='SELECT  id_par FROM s_majic.nb_10_parcelle WHERE  id_com=\'sIdCom\' AND id_dnupro=\'sDnupro\' ORDER BY nb_10_parcelle.id_par';
+$aSql['sqlite']['get_id_par_bnd']='SELECT nb_10_parcelle.id_par FROM s_majic.nb_21_suf_descr INNER JOIN s_majic.nb_10_parcelle ON nb_21_suf_descr.id_par = nb_10_parcelle.id_par WHERE nb_21_suf_descr.dnupro = \'$sDnupro\' AND nb_10_parcelle.id_dnupro != \'$sIdDnupro\' AND nb_10_parcelle.id_com=\'$sIdCom\'';
+$aSql['sqlite']['annee_reference']='SELECT annee FROM s_majic.annee_reference';
+$aSql['sqlite']['get_id_dnupro']='SELECT  id_dnupro, dnupro FROM s_majic.nb_10_parcelle WHERE id_par=\'$sidparpro\'';
+$aSql['sqlite']['compte_communal_parcelle']='SELECT fantoir_commune.id_com, proprietaire.ccodep, libdep, proprietaire. ccodir, fantoir_commune.ccocom, libcom, proprietaire.dnupro, proprietaire.id_dnupro, id_par FROM s_majic.nb_10_parcelle, s_majic.proprietaire LEFT JOIN s_majic.fantoir_commune ON s_majic.proprietaire.id_com=fantoir_commune.id_com LEFT JOIN s_majic.fantoir_direction ON fantoir_commune.ccodep= fantoir_direction.ccodep WHERE proprietaire.id_dnupro=\'$sIdDnupro\' and id_par=\'$sIdPar\'';
+$aSql['sqlite']['get_id_bat_parcelle']='SELECT id_local as id_bat FROM s_majic.bati_0010_local WHERE id_dnupro=\'$sIdDnupro\' and id_par=\'$sIdPar\' ORDER BY id_local';
+$aSql['sqlite']['get_par_id_bat']='SELECT id_local as id_bat FROM s_majic.bati_0010_local WHERE id_par=\'sIdPar\' ORDER BY id_local';
+?>
\ No newline at end of file
diff --git a/src/module_cadastreV2/web_service/class/majic_libV2/Mj.sql_all.inc b/src/module_cadastreV2/web_service/class/majic_libV2/Mj.sql_all.inc
new file mode 100755
index 0000000000000000000000000000000000000000..621d789e4710561b673b0633af7796601e512a5f
--- /dev/null
+++ b/src/module_cadastreV2/web_service/class/majic_libV2/Mj.sql_all.inc
@@ -0,0 +1,37 @@
+<?php
+$aSql['pgsql']['proprietaire']= 'SELECT *, id_dnupro, id_pro, l_ccodro, l_ccodem, dnuper, dqualp, ddenom, dnomlp, dprnlp, epxnee, dnomcp, dprncp, jdatnss, dldnss, dlign3, dlign4, dlign5, dlign6 FROM s_majic.proprietaire LEFT JOIN s_majic.tc_ccodro_code_droit ON proprietaire.ccodro = c_ccodro_code_droit.ccodro LEFT JOIN s_majic.tc_ccodem_nature_demembrement ON proprietaire.ccodem= tc_ccodem_nature_demembrement.ccodem WHERE id_dnupro=\'$sIdDnupro\' AND id_pro=\'$sIdPro\'';
+$aSql['pgsql']['bati'] = 'SELECT *, bati_0010_local.id_local , jdatat, ccosec, dnupla, ccoplc, dnvoiri,  dindic, dvoilib, ccoriv, dnubat, nesc, dniv, dpor, bati_0010_local.invar, ccoeva, cconlc, gtauom, cconad FROM s_majic.bati_0010_local LEFT JOIN majic.bati_60_descr_dep ON bati_0010_local.id_local=bati_60_descr_dep.id_local WHERE bati_0010_local.id_local=\'$sIdBat\'';
+$aSql['pgsql']['pev'] = 'SELECT  *, bati_21_pev_descr.id_pev, ccostb, ccoaff, dcapec, dcsglc, bipevla1, gnexpl, dvlpera, bati_21_pev_descr.dnupev FROM s_majic.bati_21_pev_descr LEFT JOIN s_majic.bati_36_pev_tax ON bati_21_pev_descr.id_pev=bati_36_pev_tax.id_pev WHERE bati_21_pev_descr.id_pev=\'$sIdPev\'';
+$aSql['pgsql']['parcelle']='SELECT *, id_par, jdatat, ccosec, dnupla, dnvoiri, dindic, cconvo, dvoilib, ccoriv, dparpi, gparnf FROM s_majic.nb_10_parcelle WHERE id_par=\'$sIdPar\''; 
+$aSql['pgsql']['suf']='SELECT *, id_suf, ccostn, ccosub, dsgrpf, dclssf, cnatsp, dcntsf, drcsuba FROM s_majic.nb_21_suf_descr WHERE id_suf=\'$sIdSuf\'';
+$aSql['pgsql']['compte_communal']='SELECT *, proprietaire.ccodep, proprietaire.ccodir, fantoir_commune.ccocom, libcom, dnupro, id_dnupro FROM s_majic.proprietaire LEFT JOIN s_majic.fantoir_commune ON proprietaire.id_com=fantoir_commune.id_com WHERE id_dnupro=\'$sIdDnupro\'';
+$aSql['pgsql']['exone_pev']='SELECT *, id_ex, ccolloc, gnextl, janimp, jandeb, rcexba2 FROM s_majic.bati_30_pev_exo WHERE id_ex=\'$sIdEx\'';
+$aSql['pgsql']['exon_suf']='SELECT *, id_suf, rnuexn, ccolloc, gnexts, jfinex, pexn FROM s_majic.nb_30_suf_exo WHERE id_suf=\'$sIdSuf\' and rnuexn=\'$sRnuexn\'';
+$aSql['pgsql']['lot_local']='SELECT *, id_local, klot, dnupdl, dnulot, dnumql, ddenql FROM s_majic.lot_local WHERE id_local=\'$sIdBat\' and klot=\'$sKlot\'';
+$aSql['pgsql']['get_id_pev']='SELECT  id_pev FROM s_majic.bati_21_pev_descr WHERE id_local=\'$sIdBat\'';
+$aSql['pgsql']['get_id_ex_pev']='SELECT id_ex FROM s_majic.bati_30_pev_exo WHERE id_pev=\'$sIdPev\'';
+$aSql['pgsql']['get_klot']='SELECT klot FROM s_majic.lot_local WHERE id_local=\'$sIdBat\'';
+$aSql['pgsql']['get_id_suf']='SELECT id_suf FROM s_majic.nb_21_suf_descr WHERE id_par=\'$sIdPar\'';
+$aSql['pgsql']['get_rnuexn']='SELECT rnuexn FROM s_majic.nb_30_suf_exo WHERE id_suf=\'$sIdSuf\'';
+$aSql['pgsql']['get_id_pro']='SELECT id_pro FROM s_majic.proprietaire WHERE id_dnupro=\'$sIdDnupro\'';
+$aSql['pgsql']['get_id_bat']='SELECT id_local FROM s_majic.bati_0010_local WHERE id_dnupro=\'$sIdDnupro\'';
+$aSql['pgsql']['get_id_par']='SELECT id_par FROM s_majic.nb_10_parcelle WHERE id_dnupro=\'$sIdDnupro\'';
+
+$aSql['sqlite']['proprietaire']= 'SELECT *, id_dnupro, id_pro, l_ccodro, l_ccodem, dnuper, dqualp, ddenom, dnomlp, dprnlp, epxnee, dnomcp, dprncp, jdatnss, dldnss, dlign3, dlign4, dlign5, dlign6 FROM s_majic.proprietaire LEFT JOIN s_majic.tc_ccodro_code_droit ON proprietaire.ccodro=tc_ccodro_code_droit.ccodro LEFT JOIN s_majic.tc_ccodem_nature_demembrement ON proprietaire.ccodem=tc_ccodem_nature_demembrement.ccodem WHERE id_dnupro=\'$sIdDnupro\' AND id_pro=\'$sIdPro\'';
+$aSql['sqlite']['bati'] = 'SELECT *, bati_0010_local.id_local, jdatat, ccosec, dnupla, ccoplc, dnvoiri, dindic, dvoilib, ccoriv, dnubat, nesc, dniv, dpor, bati_0010_local.invar, ccoeva, cconlc, gtauom, cconad FROM s_majic.bati_0010_local LEFT JOIN s_majic.bati_60_descr_dep ON bati_0010_local.id_local=bati_60_descr_dep.id_local WHERE bati_0010_local.id_local=\'$sIdBat\'';
+$aSql['sqlite']['pev'] = 'SELECT  *, bati_21_pev_descr. id_pev, ccostb, ccoaff, dcapec, dcsglc, bipevla1, gnexpl, dvlpera, bati_21_pev_descr.dnupev FROM s_majic.bati_21_pev_descr LEFT JOIN s_majic.bati_36_pev_tax ON bati_21_pev_descr.id_pev=bati_36_pev_tax.id_pev WHERE bati_21_pev_descr.id_pev=\'$sIdPev\'';
+$aSql['sqlite']['parcelle']='SELECT *, id_par, jdatat, ccosec, dnupla, dnvoiri, dindic, codevoie, libvoie, ccoriv, dparpi, gparnf FROM s_majic.nb_10_parcelle LEFT JOIN s_majic.fantoir_voie ON nb_10_parcelle.id_voie=fantoir_voie.id_voie WHERE id_par=\'$sIdPar\'';
+$aSql['sqlite']['suf']='SELECT *, id_suf, ccostn, ccosub, dsgrpf, dclssf, cnatsp, dcntsf, drcsuba FROM s_majic.nb_21_suf_descr WHERE id_suf=\'$sIdSuf\'';
+$aSql['sqlite']['compte_communal']='SELECT *, proprietaire. ccodep, proprietaire.ccodir,fantoir_commune.ccocom, libcom, dnupro, id_dnupro FROM s_majic.proprietaire LEFT JOIN s_majic.fantoir_commune ON proprietaire.id_com=fantoir_commune.id_com WHERE id_dnupro=\'$sIdDnupro\'';
+$aSql['sqlite']['exone_pev']='SELECT *, id_ex, ccolloc, gnextl, janimp, jandeb, rcexba2 FROM s_majic.bati_30_pev_exo WHERE id_ex=\'$sIdEx\'';
+$aSql['sqlite']['exon_suf']='SELECT *, id_suf,  rnuexn, ccolloc, gnexts, jfinex, pexn FROM s_majic.nb_30_suf_exo WHERE id_suf=\'$sIdSuf\' and rnuexn=\'$sRnuexn\'';
+$aSql['sqlite']['lot_local']='SELECT *, id_local, klot, dnupdl, dnulot, dnumql, ddenql FROM s_majic.lot_local WHERE id_local=\'$sIdBat\' and klot=\'$sKlot\''; 
+$aSql['sqlite']['get_id_pev']='SELECT  id_pev FROM s_majic.bati_21_pev_descr WHERE id_local=\'$sIdBat\'';
+$aSql['sqlite']['get_id_ex_pev']='SELECT id_ex FROM s_majic.bati_30_pev_exo WHERE id_pev=\'$sIdPev\'';
+$aSql['sqlite']['get_klot']='SELECT klot FROM s_majic.lot_local WHERE id_local=\'$sIdBat\'';
+$aSql['sqlite']['get_id_suf']='SELECT id_suf FROM s_majic.nb_21_suf_descr WHERE id_par=\'$sIdPar\'';
+$aSql['sqlite']['get_rnuexn']='SELECT  rnuexn FROM s_majic.nb_30_suf_exo WHERE id_suf=\'$sIdSuf\'';
+$aSql['sqlite']['get_id_pro']='SELECT id_pro FROM s_majic.proprietaire WHERE id_dnupro=\'$sIdDnupro\'';
+$aSql['sqlite']['get_id_bat']='SELECT id_local FROM s_majic.bati_0010_local WHERE id_dnupro=\'$sIdDnupro\'';
+$aSql['sqlite']['get_id_par']='SELECT id_par FROM s_majic.nb_10_parcelle WHERE id_dnupro=\'$sIdDnupro\'';
+?>
\ No newline at end of file
diff --git a/src/module_cadastreV2/web_service/class/majic_libV2/Mj_Attribute.class.inc b/src/module_cadastreV2/web_service/class/majic_libV2/Mj_Attribute.class.inc
new file mode 100755
index 0000000000000000000000000000000000000000..bcc320a7305b0b9131e0e78324ade1ad32a50b68
--- /dev/null
+++ b/src/module_cadastreV2/web_service/class/majic_libV2/Mj_Attribute.class.inc
@@ -0,0 +1,53 @@
+<?php
+/**
+* \file Mj_Attribute.class.inc
+* \brief Mj_Attribute.class.inc \n \n Ce fichier contient la classe php Mj_Attribute
+* 
+* Cette classe permet de s�lectionner les attributs n�cessaires afin de traiter la partie Attribute. 
+*
+* \author Nicolas Chazeau
+* \author Olivier Gayte <olivier.gayte@veremes.com>
+*/
+/**
+* \class Mj_Attribute
+* \brief Mj_Attribute Class \n \n Mj_Attributes est une classe PHP qui h�rite de la classe Mj_Attribute.
+*
+* Cette classe permet de s�lectionner les attributs n�cessaires afin de traiter la partie Attribute. 
+*
+* \author Nicolas Chazeau
+* \author Olivier Gayte <olivier.gayte@veremes.com>
+*/
+require_once ("Mj.class.inc");
+
+class Mj_Attribute extends Mj {
+	/**
+	* Cette m�thode m�tier permet de r�cup�rer l'attribut parmi les attributs d'une emprise calcul�e sur la parcelle d'un compte communal.
+	* \param $aAttributes Tableau.
+	* \param $aField Tableau des libell�s issue des properties.
+	* \private
+	*/
+	function __construct($aAttributes,$aField=Array()){
+		$aAttribute=array();
+		$aAttribute["label"]=$aAttributes["label"];
+		$aAttribute["title"]=$aField[$aAttributes["label"]];
+		$aAttribute["value"]=$aAttributes["value"];
+		$this->aFields=$aAttribute;
+	}
+	/**
+	* Cette m�thode permet de construire un tableau correspondant au relev� de propri�t�.
+	* \return Retourne un tableau associatif correspondant au relev� de propri�t�.
+	*/
+	function getExportFields(){
+		$aExportFields=array();
+		if($this->isEmpty()){
+			$aExportFields="";
+		}else{
+			$aExportFields['label']=$this->aFields["label"];
+			$aExportFields['title']=$this->aFields["title"];
+			$aExportFields['value']=$this->aFields["value"];
+		}
+		return $aExportFields;
+	}
+
+}
+?>
\ No newline at end of file
diff --git a/src/module_cadastreV2/web_service/class/majic_libV2/Mj_Attributes.class.inc b/src/module_cadastreV2/web_service/class/majic_libV2/Mj_Attributes.class.inc
new file mode 100755
index 0000000000000000000000000000000000000000..515604605946549905d8e69833364f377cb83676
--- /dev/null
+++ b/src/module_cadastreV2/web_service/class/majic_libV2/Mj_Attributes.class.inc
@@ -0,0 +1,64 @@
+<?php
+/**
+* \file Mj_Attributes.class.inc
+* \brief Mj_Attributes.class.inc \n \n Ce fichier contient la classe php Mj_Attributes
+* 
+* Cette classe permet de s�lectionner les attributs n�cessaires afin de traiter la partie Attributes d'une Emprise. 
+*
+* \author Nicolas Chazeau
+* \author Olivier Gayte <olivier.gayte@veremes.com>
+*/
+/**
+* \class Mj_Attributes
+* \brief Mj_Attributes Class \n \n Mj_Attributes est une classe PHP qui h�rite de la classe Mj.
+*
+* Cette classe permet de s�lectionner les attributs n�cessaires afin de traiter la partie Attributes d'une Emprise. 
+*
+* \author Nicolas Chazeau
+* \author Olivier Gayte <olivier.gayte@veremes.com>
+*/
+require_once ("Mj.class.inc");
+require_once ("Mj_Attribute.class.inc");
+
+class Mj_Attributes extends Mj {
+	/**
+	* Tableau associatif comportant la liste des objets Attribut d'une Emprise.
+	*/
+	var $aAttributes =array();
+
+	/**
+	* Cette m�thode m�tier permet de r�cup�rer les attributs d'une emprise calcul�e sur la parcelle d'un compte communal.
+	* \param $aAttributesEmprise Tableau des attributs.
+	* \param $aField Tableau des libell�s issue des properties.
+	* \private
+	* \return Un tableau HTML sous la forme d'une cha�ne de caract�res.
+	*/
+	function __construct($aAttributesEmprise,$aField=Array()){
+		foreach ($aAttributesEmprise as $sAttributeEmprise => $aValue){
+			if (is_array($aValue)){
+				foreach ($aValue as $sLabel => $sValue){
+					$aAttribute["label"]=$sLabel;
+					$aAttribute["value"]=$sValue;
+					array_push($this->aAttributes,new Mj_Attribute($aAttribute,$aField));
+				}
+			}
+		}
+		$aTest["test"]="test";
+		$this->aFields=$aTest;
+		$this->aObjects=$this->aAttributes;
+	}
+
+	/**
+	* Cette m�thode permet de construire un tableau.
+	* \return Retourne un tableau associatif.
+	*/
+	function getExportFields(){
+		$aExportFields=array();
+		if($this->isEmpty()){
+			$aExportFields="";
+		}
+		return $aExportFields;
+	}
+
+}
+?>
\ No newline at end of file
diff --git a/src/module_cadastreV2/web_service/class/majic_libV2/Mj_Bati.class.inc b/src/module_cadastreV2/web_service/class/majic_libV2/Mj_Bati.class.inc
new file mode 100755
index 0000000000000000000000000000000000000000..d4c920485e30673946cd92ac584eabe2b44e29b3
--- /dev/null
+++ b/src/module_cadastreV2/web_service/class/majic_libV2/Mj_Bati.class.inc
@@ -0,0 +1,605 @@
+<?php
+/**
+* \file Mj_Bati.class.inc
+* \brief Mj_Bati.class.inc \n \n Ce fichier contient la classe php Mj_Bati
+* 
+* Cette classe permet de sélectionner les attributs nécessaires afin de traiter la partie bati. 
+*
+* \author Damien Bedel
+* \author Olivier Gayte <olivier.gayte@veremes.com>
+*/
+/**
+* \class Mj_Bati
+* \brief Mj_Bati Class \n \n Mj_Bati est une classe PHP qui hérite de la classe Mj.
+*
+* Cette classe permet de sélectionner les attributs nécessaires afin de traiter la partie bâti. 
+*
+* \author Damien Bedel
+* \author Olivier Gayte <olivier.gayte@veremes.com>
+*/
+require_once ("Mj.class.inc");
+require_once ("Mj_Pev.class.inc");
+require_once ("Mj_Lot_Local.class.inc");
+
+class Mj_Bati extends Mj {
+	/**
+	* Tableau associatif comportant la liste des objets Pev du bâti
+	*/
+	var $aPev=array();
+	/**
+	* Tableau associatif comportant la liste des objets Lot_Local du bâti
+	*/
+	var $aLotLocal=array();
+
+	/**
+	* \param $sIdBat Identifiant de bâti
+	* \param $oBD Objet de connexion PDO_BD
+	*/
+	function __construct($sIdBat,$oBD, $sEncryptedKey=''){
+		$this->sEncryptKey = $sEncryptedKey;
+		include $this->sRessourcesFile;
+		$this->sSql=$aSql[$oBD->sgbd]['bati'];
+		$this->sSql=str_replace('$sIdBat', $sIdBat, $this->sSql);
+		$oPDOresult= $oBD->execute($this->sSql);
+		if ($oBD->enErreur()) {
+			$this->sStatus=1;
+			$this->sMessage=$oBD->getBDMessage();
+		}else{
+			$this->aFields=$oBD->ligneSuivante($oPDOresult);
+			$this->sStatus=0;
+		}
+		$this->aPev=$this->get_aPev($oBD);
+		$this->aPro=$this->get_aPro($oBD);
+		$this->aLotLocal=$this->get_aLot_Local($oBD);
+		$this->aObjects=array_merge ($this->aPev, $this->aLotLocal, $this->aPro);
+	}
+	/**
+	* Cette méthode permet de récupérer les ID_PRO en fonction d'un ID_DNUPRO donné.
+	* \return Retourne un tableau de ID_PRO.
+	*/
+	function get_aId_Pro($oBD){
+		if($this->isEmpty()){
+			$aIdPro="";
+		}else{
+			include $this->sRessourcesFile;
+			$aIdPro=array();
+			$this->sSql=$aSql[$oBD->sgbd]['get_id_pro'];
+			$this->sSql=str_replace('$sIdDnupro', $this->encrypt($this->aFields['b_iddnupro']), $this->sSql);
+			$oPDOresult= $oBD->execute($this->sSql);
+			if ( $oBD->enErreur()) {
+				$this->sStatus=1;
+				$this->sMessage=$oBD->getBDMessage();
+			}else{
+				while($aResultFetch=$oBD->tableauSuivant ($oPDOresult)){
+					array_push($aIdPro,$aResultFetch[0]);
+					$this->sStatus=0;
+				}
+			}
+		}
+		return $aIdPro;
+		$oPDOresult=$oBD->fermeResultat();
+	}	
+	/**
+	* Cette méthode permet de récupérer la liste des objets Proprietaire
+	* \return Retourne un tableau d'objets Proprietaire
+	*/
+	function get_aPro($oBD){
+		$aPro=array();
+		if($this->isEmpty()){
+			$aPro="";
+		}else{
+			$aIdPro=$this->get_aId_Pro($oBD);
+			foreach($aIdPro as $sIdPro){
+				array_push($aPro,new Mj_Proprietaire($this->aFields['b_iddnupro'],$sIdPro,$oBD, $this->sEncryptKey));
+			}
+		}
+		return $aPro;
+	}
+	/**
+	* Cette méthode permet de récupérer les Id_Pev en fonction d'un Id_Bat donné.
+	* \return Retourne un tableau de chaînes de caractères.
+	*/
+	function get_aId_Pev($oBD){
+		if($this->isEmpty()){
+			$aIdPev="";
+		}else{
+			include $this->sRessourcesFile;
+			$aIdPev=array();
+			$this->sSql=$aSql[$oBD->sgbd]['get_id_pev'];
+			$this->sSql=str_replace('$sIdBat', $this->aFields['id_local'], $this->sSql);
+			$oPDOresult=$oBD->execute($this->sSql);
+			if ($oBD->enErreur()){
+				$this->sStatus=1;
+				$this->sMessage=$oBD->getBDMessage();
+			}else{
+				while($aResultFetch=$oBD->tableauSuivant ($oPDOresult)){
+					array_push($aIdPev,$aResultFetch[0]);
+					$this->sStatus=0;
+				}
+			}
+		}
+		return $aIdPev;
+	}	
+	/**
+	* Cette méthode permet de récupérer la liste des objets Pev du bâti
+	* \return Retourne un tableau d'objets Pev
+	*/
+	function get_aPev($oBD){
+		$aPev=array();
+		if($this->isEmpty()){
+			$aPev="";
+		}else{
+		  $aIdPev=$this->get_aId_Pev($oBD);
+			foreach($aIdPev as $sValue){
+				array_push($aPev,new Mj_Pev($sValue,$oBD));
+			}
+		}
+		return $aPev;
+	}
+	/**
+	* Cette méthode permet de récupérer les Klot en fonction d'un Id_Bat donné
+	* \return Retourne un tableau de chaînes de caractères
+	*/
+	function get_aKlot($oBD){
+		if($this->isEmpty()){
+			$aKlot="";
+		}else{
+			include $this->sRessourcesFile;
+			$aKlot=array();
+			$this->sSql=$aSql[$oBD->sgbd]['get_klot'];
+			$this->sSql=str_replace('$sIdBat', $this->aFields['id_local'], $this->sSql);
+			$oPDOresult=$oBD->execute($this->sSql);
+			if ( $oBD->enErreur()) {
+				$this->sStatus=1;
+				$this->sMessage=$oBD->getBDMessage();   	
+			}else{
+				while($aResultFetch=$oBD->tableauSuivant ($oPDOresult)){
+					array_push($aKlot,$aResultFetch[0]);
+					$this->sStatus=0;
+				}
+			}
+		}
+		return $aKlot;
+	}	
+	/**
+	* Cette méthode permet de récupérer la liste des objets Lot-Local du bâti
+	* \return Retourne un tableau d'objets Lot-Local
+	*/
+	function get_aLot_Local($oBD){
+		$aLotLocal=array();
+		if($this->isEmpty()){
+			$aLotLocal="";
+		}else{
+			$aKlot=$this->get_aKlot($oBD);
+			foreach($aKlot as $sKlot){
+				array_push($aLotLocal,new Mj_Lot_Local($this->aFields['id_local'],$sKlot,$oBD));
+			}
+		}
+		return $aLotLocal;	
+	}
+	
+	/**
+	* Cette méthode permet de construire un tableau correspondant au relevé de propriété.
+	* \return Retourne un tableau associatif correspondant au relevé de propriété.
+	*/
+	function getExportFields(){
+		$aExportFields=array();
+		if($this->isEmpty()){
+			$aExportFields="";
+		}else{
+			$aExportFields['date']=$this->getJdatat();
+			$aExportFields['section']=$this->aFields['ccosec'];
+			$aExportFields['num_plan']=$this->aFields['dnupla'];
+			$aExportFields['cp']=$this->aFields['ccoplc'];
+			$aExportFields['voirie']=$this->getVoirie();
+			$aExportFields['adresse']=$this->aFields['dvoilib'];
+			$aExportFields['code_rivoli']=$this->aFields['ccoriv'];
+			$aExportFields['bat']=$this->aFields['dnubat'];
+			$aExportFields['ent']=$this->aFields['nesc']; // anciennement desc , mot réservé par sql
+			$aExportFields['niv']=$this->aFields['dniv'];
+			$aExportFields['num_de_porte']=$this->aFields['dpor'];
+			$aExportFields['num_invar']=$this->getNumeroInvar();
+			$aExportFields['m_eva']=$this->aFields['ccoeva'];
+			$aExportFields['nat_loc']=$this->getNatLoc();
+			$aExportFields['tx_om']=$this->aFields['gtauom'];
+			$aExportFields['s_tar']=$this->getSTar();
+			$aExportFields['af']=$this->getAf();
+			$aExportFields['cat']=$this->getCat();
+			$aExportFields['revenu_cadastral']=$this->getRevenuCadastral();
+			$aExportFields['revenu_cadastral_txt']=$this->setFloatToText($this->getRevenuCadastral());
+			$aExportFields['dvlpera']=$this->aFields['dvlpera'];
+			$aExportFields['b_dnupro']=$this->aFields['b_dnupro'];
+			$aExportFields['b_iddnupro']=$this->aFields['b_iddnupro'];
+			$aExportFields['dteloc']=$this->aFields['dteloc'];
+			$aExportFields['dvltrt']=$this->aFields['dvltrt'];
+			$aExportFields['dnumql']=$this->aFields['dnumql'];
+			$aExportFields['ddenql']=$this->aFields['ddenql'];
+			//$aExportFields['nat_exo']=$this->getNatExo();
+			//$aExportFields['exoneration']=$this->getExoneration();
+			//$aExportFields['revenu_cadastral_avec_exo']=$this->getRevenuCadastralAvecExo();
+			//$aExportFields['revenu_cadastral_avec_pp']=$this->getRevenuCadastralAvecPP();
+			$aExportFields['num_invar']=$this->aFields['invar'];
+			$aExportFields['ddenql']=$this->aFields['ddenql'];
+			$aExportFields['local_type']=$this->aFields['dteloc'];
+			$aExportFields['nature']=$this->aFields['cconlc'];
+			$aExportFields['lib_nature']=$this->aFields['lib_cconlc'];
+			$aExportFields['occupation']=$this->aFields['dnatlc'];
+			$aExportFields['lib_occupation']=$this->getOccupation();
+			$aExportFields['date_mut']=$this->getJdatat_full();
+			$aExportFields['annee_constr']=$this->aFields['jannat'];
+			$aExportFields['niveaux']=$this->aFields['dnbniv'];
+			$aExportFields['libcom']=$this->aFields['libcom'];
+		}
+		return $aExportFields;
+	}
+	/**
+	* Cette méthode permet de récupérer les deux derniers caractères de l'attribut Jdatat et d'y ajouter 1.
+	* \return Retourne une chaîne de caractères.
+	*/
+	function getJdatat_full(){
+		$sjdatat=$this->aFields['jdatat'];
+		if ($sjdatat != ""){
+			if (preg_match( '`^\d{1,2}/\d{1,2}/\d{4}$`' , $sjdatat ) ){
+				$sNewJdatat_full=$sjdatat;
+			}else if (preg_match( '`^\d{1,2}/\d{1,2}/\d{2}$`' , $sjdatat ) ){
+				$sNewJdatat_full=$sjdatat;
+			}else{
+				$sNewJdatat_full=substr($sjdatat,0,2)."/".substr($sjdatat,2,2)."/".substr($sjdatat,4,4);
+			}
+		}
+		return $sNewJdatat_full;
+	}
+	/**
+	* Cette méthode permet de récupérer les deux derniers caractères de l'attribut Jdatat et d'y ajouter 1.
+	* \return Retourne une chaîne de caractères.
+	*/
+	function getJdatat(){
+		$sNewJdatat=$this->aFields['jdatat'];
+		if (preg_match( '`^\d{1,2}/\d{1,2}/\d{4}$`' , $sNewJdatat ) ){			
+			$sNewJdatat=substr("$sNewJdatat", 6, 4)+1;
+			$sNewJdatat=(string)(substr("$sNewJdatat", 2, 2));
+		}else if (preg_match( '`^\d{1,2}/\d{1,2}/\d{2}$`' , $sNewJdatat ) ){
+			$sNewJdatat=(string) (substr("$sNewJdatat", 6, 2)+1);
+			if(strlen($sNewJdatat) == 1){
+				$sNewJdatat='0'.$sNewJdatat;
+			}
+			$sNewJdatat=(string) (substr("$sNewJdatat", -2, 2));
+		}else{
+			$sNewJdatat=substr("$sNewJdatat", 4, 4)+1;
+			$sNewJdatat=(string)(substr("$sNewJdatat", 2, 2));
+		}
+		return $sNewJdatat;
+	}
+	/**
+	* Cette méthode permet de supprimer le code commune de l'attribut invar.
+	* \return Retourne une chaîne de caractères.
+	*/
+	function getNumeroInvar(){
+		$sNumeroInvar=$this->aFields['invar'];
+		$sNumeroInvar= substr("$sNumeroInvar", 3, 7);
+		return $sNumeroInvar;
+	}
+	/**
+	* Cette méthode permet de concaténer les attributs dnvoiri et indic.
+	* \return Retourne une chaîne de caractères.
+	*/
+	function getVoirie(){
+		$sVoirie=ltrim($this->aFields['dnvoiri'],'0').$this->aFields['dindic'];
+		return $sVoirie;
+	}
+	/**
+	* Cette méthode permet de récupérer la valeur de l'attribut 's_tar' dans le tableau aPev.
+	* \return Retourne une chaîne de caractères.
+	*/
+	function getSTar(){
+		if(count($this->aPev)==1){
+			return $this->aPev[0]->aFields['ccostb'];
+		}else{
+			return '';
+		}
+	}
+	/**
+	* Cette méthode permet de récupérer la valeur de l'attribut 'af' dans le tableau aPev.
+	* \return Retourne une chaîne de caractères.
+	*/
+	function getAf(){
+		if(count($this->aPev)==1){
+			return $this->aPev[0]->aFields['ccoaff'];
+		}else{
+			return '';
+		}
+	}
+	/**
+	* Cette méthode permet de récupérer la valeur de l'attribut 'cat' dans le tableau aPev.
+	* \return Retourne une chaîne de caractères.
+	*/
+	function getCat(){
+		if(count($this->aPev)==1){
+			return $this->aPev[0]->aFields['dcapec'];
+		}else{
+			return '';
+		}
+	}
+	/**
+	* Cette méthode permet de récupérer la somme du revenu cadastral pour un bâti avec exonération de type EP, CD, CR, DR ou NI.
+	* \return Retourne un entier.
+	*/
+	/*function getRevenuCadastralAvecExo(){
+		$iRevenuCadastralAvecExo=0;
+		foreach ($this->aPev as $oPev) {
+			if(ereg ("EP|CD|CR|DR|NI|ND", $oPev->aExportFields['nat_exo'])){
+				$iRevenuCadastralAvecExo=$iRevenuCadastralAvecExo + $oPev->aExportFields['revenu_cadastral'];
+			}
+		} 
+		return $iRevenuCadastralAvecExo;
+	}*/
+	/**
+	* Cette méthode permet de récupérer la somme du revenu cadastral pour un bâti avec exonération de type PP.
+	* \return Retourne un entier.
+	*/
+	/*function getRevenuCadastralAvecPP(){
+		$iRevenuCadastralAvecPP=0;
+		foreach ($this->aPev as $oPev) {
+			if((ereg ("PP", $oPev->aExportFields['nat_exo'])) && ((int) ($this->aFields['dnupev']>1))){
+				$iRevenuCadastralAvecPP=$iRevenuCadastralAvecPP + $oPev->aExportFields['revenu_cadastral'];
+			}
+		} 
+		return $iRevenuCadastralAvecPP;
+	}
+	/**
+	* Cette méthode permet de récupérer la somme du revenu cadastral pour un bâti.
+	* \return Retourne un entier.
+	*/
+	function getRevenuCadastral(){
+		$iRevenuCadastral=0;
+		foreach($this->aPev as $oPev){
+			$iRevenuCadastral=$iRevenuCadastral+ (int) $oPev->getRevenuCadastral();
+		}
+		return $iRevenuCadastral;
+	}
+	/**
+	* Cette méthode permet de récupérer la somme du revenu cadastral pour un bâti.
+	* \return Retourne un float.
+	*/
+	function getRevenuCadastralfloat(){
+		$iRevenuCadastral=0;
+		foreach($this->aPev as $oPev){
+			$fRevenuCadastral=$fRevenuCadastral+ (float) $oPev->getRevenuCadastral();
+		}
+		return $fRevenuCadastral;
+	}
+	/**
+	* Cette méthode permet de récupérer la somme des exonérations pour un bâti.
+	* \return Retourne un entier.
+	*/
+	function getExoneration($sLccodem){
+		$iExoneration=0;
+		foreach ($this->aPev as $oPev){
+			if (($sLccodem!='') && (ereg ("PP", $oPev->getNatExo())) && ((int) ($this->aFields['dnupev']>1))){
+				$iExoneration=$iExoneration + $oPev->getRevenuCadastral();
+			}elseif($oPev->getNatExo()!=''){
+				$iExoneration=$iExoneration + $oPev->getRevenuCadastral();
+			}
+		} 
+		return $iExoneration;
+	}
+	/**
+	* Cette méthode permet de récupérer la somme des exonérations pour un bâti.
+	* \return Retourne un float.
+	*/
+	function getExonerationfloat($sLccodem){
+		$fExoneration=0;
+		foreach ($this->aPev as $oPev){
+			if (($sLccodem!='') && (ereg ("PP", $oPev->getNatExo())) && ((int) ($this->aFields['dnupev']>1))){
+				$fExoneration=$fExoneration + $oPev->getRevenuCadastralfloat();
+			}elseif($oPev->getNatExo()!=''){
+				$fExoneration=$fExoneration + $oPev->getRevenuCadastralfloat();
+			}
+		} 
+		return $fExoneration;
+	}
+	/**
+	* Cette méthode permet de retourner la nature du local.
+	* \return Retourne une chaîne de caractères qui peut être valide (la chaîne de caractères a été vérifiée d'après des exemples de relevés de propriété) ou non valide (la chaîne de caractères n'a pas pu être vérifiée).
+	*/
+	function getNatLoc(){
+		switch($this->aFields["cconlc"]){
+			case 'MA' :
+				$sNatLoc="MAIS"; // Cas validé
+			break;
+			case 'AP' :
+				$sNatLoc="APP"; // Cas validé
+			break;
+			case 'DE' :
+				$sNatLoc=$this->getNatureDep(); // Cf fonction getNatureDep()
+			break;
+			case 'DC' :
+				$sNatLoc="DLC"; // cas non validé
+			break;
+			case 'LC' :
+				$sNatLoc="L.COM"; // Cas validé
+			break;
+			case 'CM' :
+				$sNatLoc="CM"; // Cas validé
+			break;
+			case 'CA' :
+				$sNatLoc="CA"; // Cas validé
+			break;
+			case 'CD' :
+				$sNatLoc="DEP.C"; // Cas validé
+			break;
+			case 'CB' :
+				$sNatLoc="L.DIV"; // Cas validé
+			break;
+			case 'ME' :
+				$sNatLoc="M.EXC"; // Cas validé
+			break;
+			case 'MP' :
+				$sNatLoc="M.PAR"; // Cas validé
+			break;
+			case 'SM' :
+				$sNatLoc="SOLM"; // Cas non validé
+			break;
+			case 'AU' :
+				$sNatLoc="AU"; // Cas validé
+			break;
+			case 'CH' :
+				$sNatLoc="CHANT"; // Cas validé
+			break;
+			case 'U ' :
+				$sNatLoc="E.IND"; // Cas validé
+			break;
+			case 'US' :
+				$sNatLoc="US"; // Cas validé
+			break;
+			case 'UG' :
+				$sNatLoc="AGAZ"; // Cas non validé
+			break;
+			case 'UE' :
+				$sNatLoc="UE"; // Cas validé
+			break;
+			case 'U1' :
+				$sNatLoc="GARE"; // Cas non validé
+			break;
+			case 'U2' :
+				$sNatLoc="GTRI"; // Cas non validé
+			break;
+			case 'U3' :
+				$sNatLoc="GAMAT"; // Cas non validé
+			break;
+			case 'U4' :
+				$sNatLoc="GAMAG"; // Cas non validé
+			break;
+			case 'U5' :
+				$sNatLoc="GDETI"; // Cas non validé
+			break;
+			case 'U6' :
+				$sNatLoc="GDERE"; // Cas non validé
+			break;
+			case 'U7' :
+				$sNatLoc="GMATR"; // Cas non validé
+			break;
+			case 'U8' :
+				$sNatLoc="GEMR"; // Cas non validé
+			break;
+			case 'U9' :
+				$sNatLoc="GSTUS"; // Cas non validé
+			break;
+			case 'AT' :
+				$sNatLoc="AT"; // Cas validé
+			break;
+			default :
+				$sNatLoc=substr($this->aFields["cconlc"],0,4);
+			break;
+		}
+		return $sNatLoc;
+	}
+	/**
+	* Cette méthode permet de retourner la nature de dépendance.
+	* \return Retourne une chaîne de caractères qui peut être valide (la chaîne de caractères a été vérifiée d'après des exemples de relevés de propriété) ou non valide (la chaîne de caractères n'a pas pu être vérifiée).
+	*/
+	function getNatureDep(){
+		switch($this->aFields["cconad"]){
+			case 'GA' :
+				$sNatureDep="GAR"; // Cas validé
+			break;
+			case 'CV' :
+				$sNatureDep="CAVE"; // Cas validé
+			break;
+			case 'GR' :
+				$sNatureDep="GREN"; // Cas validé
+			break;
+			case 'TR' :
+				$sNatureDep="TERR"; // Cas non validé
+			break;
+			case 'GP' :
+				$sNatureDep="GPARK"; // Cas validé
+			break;
+			case 'GC' :
+				$sNatureDep="GRCA"; // Cas non validé
+			break;
+			case 'BX' :
+				$sNatureDep="BOX"; // Cas validé
+			break;
+			case 'PK' :
+				$sNatureDep="PARK"; // Cas validé
+			break;
+			case 'CL' :
+				$sNatureDep="CELL"; // Cas non validé
+			break;
+			case 'BD' :
+				$sNatureDep="BUAN"; // Cas non validé
+			break;
+			case 'BC' :
+				$sNatureDep="BUCH"; // Cas non validé
+			break;
+			case 'RS' :
+				$sNatureDep="REMI"; // Cas non validé
+			break;
+			case 'TT' :
+				$sNatureDep="TT"; // Cas validé
+			break;
+			case 'PI' :
+				$sNatureDep="P.IND"; // Cas validé
+			break;
+			case 'PA' :
+				$sNatureDep="AGREM"; // Cas validé
+			break;
+			case 'CD' :
+				$sNatureDep="CHDO"; // Cas non validé
+			break;
+			case 'DC' :
+				$sNatureDep="DEP.C"; // Cas validé
+			break;
+			case 'JH' :
+				$sNatureDep="J.HIV"; // Cas validé
+			break;
+			case 'PS' :
+				$sNatureDep="PISC"; // Cas validé
+			break;
+			case 'SR' :
+				$sNatureDep="SERR"; // Cas non validé
+			break;
+			default :
+				$sNatureDep=substr($this->aFields["cconad"],0,4);
+			break;
+		}
+		return $sNatureDep;
+	}
+	/**
+	* Cette méthode permet de formater un décimal pour l'affichage.
+	* \return Retourne une chaine
+	*/
+	function setFloatToText($fFloat){
+		return number_format($fFloat,2,'.','');
+	}
+	/**
+	* Cette méthode permet de retourner l'occupation du logement
+	* \return Retourne une chaîne de caractères qui peut être valide (la chaîne de caractères a été vérifiée d'après des exemples de relevés de propriété) ou non valide (la chaîne de caractères n'a pas pu être vérifiée).
+	*/
+	function getOccupation(){
+		switch($this->aFields["dnatlc"]){
+			case 'P' :
+				$sOccupation="Proprietaire ou  Usufruitier";
+			break;
+			case 'L' :
+				$sOccupation="Location autre que propriétaire ou usufruitier";
+			break;
+			case 'V' :
+				$sOccupation="Vacant";
+			break;
+			case 'T' :
+				$sOccupation="Location, non affectée à l'habitation, soumise à TVA";
+			break;
+			case 'D' :
+				$sOccupation="Habitation principale occupée par le propriétaire";
+			break;
+			default :
+				$sOccupation=substr($this->aFields["dnatlc"],0,1);
+			break;
+		}
+		return $sOccupation;
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/src/module_cadastreV2/web_service/class/majic_libV2/Mj_Bati_Parcelle.class.inc b/src/module_cadastreV2/web_service/class/majic_libV2/Mj_Bati_Parcelle.class.inc
new file mode 100755
index 0000000000000000000000000000000000000000..06baf6cef02870d78a922ef8c525b5f5a12bcb9c
--- /dev/null
+++ b/src/module_cadastreV2/web_service/class/majic_libV2/Mj_Bati_Parcelle.class.inc
@@ -0,0 +1,162 @@
+<?php
+/**
+* \file Mj_Bati_Parcelle.class.inc
+* \brief Mj_Bati_Parcelle.class.inc \n \n Ce fichier contient la classe php Mj_Bati_Parcelle
+*
+* Cette classe permet de sélectionner les attributs nécessaires afin de traiter les batis associés à une parcelle.
+*
+* \author Damien Bedel
+* \author Olivier Gayte <olivier.gayte@veremes.com>
+* \author Fabien Marty <fabien.marty@veremes.com>
+*/
+
+require_once ("Mj.class.inc");
+require_once ("Mj_Bati.class.inc");
+require_once ("Mj_Proprietaire.class.inc");
+
+class Mj_Bati_Parcelle extends Mj {
+	/**
+	* Tableau associatif comportant la liste des objets Bati de la parcelle.
+	*/
+	var $aBat=array();
+	/**
+	* Chaine qui stocke l'année de référence des données  casdatrales.
+	*/
+	var $sAnneeReference;
+
+	/**
+	* \param $sIdPar Identifiant de la parcelle
+	* \param $oBD Objet de connexion
+	*/
+	function __construct($sIdPar,$oBD){
+		include $this->sRessourcesFile;
+		$this->sSql=$aSql[$oBD->sgbd]['bati_parcelle'];
+		$this->sSql=str_replace('sIdPar',$sIdPar,$this->sSql);
+		$oPDOresult=$oBD->execute($this->sSql);
+		if($oBD->enErreur()){
+			$this->sStatus=1;
+			$this->sMessage=$oBD->getBDMessage();
+		}else{
+			$this->sStatus=0;
+			$this->aFields=$oBD->ligneSuivante ($oPDOresult);
+		}
+		$oPDOresult=$oBD->fermeResultat();
+		$this->aBat=$this->get_aBat($oBD,$sIdPar);
+		$this->sSql=$aSql[$oBD->sgbd]['annee_reference'];
+		$oPDOresult=$oBD->execute($this->sSql);
+		if ($oBD->erreurRencontree != 0){
+			$this->sStatus=1;
+			$this->sMessage=$oBD->getBDMessage();
+		}else{
+			$aAnneeReference=$oBD->ligneSuivante ($oPDOresult);
+			$this->sAnneeReference=$aAnneeReference['annee'];
+		}
+  		$this->aObjects=$this->aBat;
+	}
+	/**
+	* Cette méthode permet de récupérer les ID_BAT en fonction d'un ID_PAR donné
+	* \param $oBD Objet de connexion
+	* \param $sIdPar Chaine identifiant de la parcelle
+	* \return Retourne un tableau de ID_BAT
+	*/
+	function get_aId_Bat($oBD,$sIdPar){
+		if($this->isEmpty()){
+			$aIdBat="";
+		}else{
+			include $this->sRessourcesFile;
+			$aIdBat=array();
+			$this->sSql=$aSql[$oBD->sgbd]['get_par_id_bat'];
+			$this->sSql=str_replace('sIdPar',$sIdPar,$this->sSql);
+			$oPDOresult=$oBD->execute($this->sSql);
+			if($oBD->enErreur()){
+				$this->sStatus=1;
+				$this->sMessage=$oBD->getBDMessage();
+			}else{
+				while($aResultFetch=$oBD->tableauSuivant ($oPDOresult)){
+					array_push($aIdBat,$aResultFetch[0]);
+					$this->sStatus=0;
+				}
+			}
+		}
+		return $aIdBat;
+	}
+	/**
+	* Cette méthode permet de récupérer la liste des objets BATI
+	* \param $oBD Objet de connexion
+	* \param $sIdPar Chaine identifiant de la parcelle
+	* \return Retourne un tableau d'objets BATI
+	*/
+	function get_aBat($oBD,$sIdPar){
+		$aBat=array();
+		if($this->isEmpty()){
+			$aBat="";
+		}else{
+			$aIdBat=$this->get_aId_Bat($oBD,$sIdPar);
+			foreach($aIdBat as $sIdBat){
+				array_push($aBat,new Mj_Bati($sIdBat,$oBD));
+			}
+		}
+		return $aBat;
+	}
+	/**
+	* Cette méthode permet de construire un tableau correspondant au relevé de propriété.
+	* \return Retourne un tableau associatif correspondant au relevé de propriété.
+	*/
+	function getExportFields(){
+		$aExportFields=array();
+		if($this->isEmpty()){
+			$aExportFields="";
+		}else{
+			$aExportFields['id_par']=$this->aFields['id_par'];
+			$aExportFields['annee_de_maj']=$this->sAnneeReference;
+			$aExportFields['dep_dir']=$this->getDepdir();
+			$aExportFields['code_dep']=$this->aFields['ccodep'];
+			$aExportFields['code_com']=$this->aFields['ccocom'];
+			$aExportFields['lib_dep']=$this->aFields['libdep'];
+			$aExportFields['com']=$this->getCom();
+			$aExportFields['libcom']=$this->aFields['libcom'];
+			$aExportFields['role']="";
+			$aExportFields['vue']="";
+			$aExportFields['contenance']=$this->aFields['dcntpa'];
+			$aExportFields['adresse']=$this->getAdresseParcelle();
+			$aExportFields['total_valeur_locative']=$this->getValeurLocativeBati();
+		}
+		return $aExportFields;
+	}
+	/**
+	* Cette méthode permet de concaténer les attributs ccodep et ccodir.
+	* /return Retourne une chaîne de caractères correspondant au DEP DIR du RP.
+	*/
+	function getDepdir(){
+		$sDepdir=$this->aFields['ccodep']." ".$this->aFields['ccodir'];
+		return $sDepdir;
+	}
+	/**
+	* Cette méthode permet de concaténer les attributs ccocom et libcom.
+	* /return Retourne une chaîne de carcatères correspondant au COM du RP.
+	*/
+	function getCom(){
+		$sCom=$this->aFields['ccocom']." ".$this->aFields['libcom'];
+		return $sCom;
+	}
+	/**
+	* Cette méthode permet de concaténer les attributs cconvo et dvoilib.
+	* \return Retourne une chaîne de caractères.
+	*/
+	function getAdresseParcelle(){
+		$sAdresseParcelle=ltrim(rtrim($this->aFields['dnvoiri']),'0').rtrim($this->aFields['dindic'])." ".rtrim($this->aFields['cconvo'])." ".rtrim($this->aFields['dvoilib']);
+		return $sAdresseParcelle;
+	}
+	/**
+	* Cette méthode permet de récupérer la valeur locative totale du bâti.
+	* \return Retourne un double
+	*/
+	function getValeurLocativeBati(){
+		$iValeurLocativeBati=0;
+		foreach($this->aBat as $oBat){
+			$iValeurLocativeBati=$oBat->aFields['dvlpera']+$iValeurLocativeBati;
+		}
+		return $iValeurLocativeBati;
+	}
+}
+?>
\ No newline at end of file
diff --git a/src/module_cadastreV2/web_service/class/majic_libV2/Mj_Bati_Parcelles.class.inc b/src/module_cadastreV2/web_service/class/majic_libV2/Mj_Bati_Parcelles.class.inc
new file mode 100755
index 0000000000000000000000000000000000000000..36ccf7e1387e034cfbc32fe2a5bcdf874c38f0f5
--- /dev/null
+++ b/src/module_cadastreV2/web_service/class/majic_libV2/Mj_Bati_Parcelles.class.inc
@@ -0,0 +1,73 @@
+<?php
+
+/**
+ * \file Mj_Bati_Parcelles.class.inc
+ * \brief Mj_Bati_Parcelles.class.inc \n \n Ce fichier contient la classe php Mj_Bati_Parcelles
+ *
+ * Cette classe permet de s�lectionner les attributs n�cessaires afin de traiter les batis associ�s � une parcelle.
+ *
+ * \author Olivier Gayte <olivier.gayte@veremes.com>
+ * \author Fabien Marty <fabien.marty@veremes.com>
+ */
+require_once ("Mj.class.inc");
+require_once ("Mj_Bati_Parcelle.class.inc");
+
+class Mj_Bati_Parcelles extends Mj {
+
+    /**
+     * \param $aIdPar Identifiant de la parcelle
+     * \param $oBD Objet de connexion
+     */
+    function __construct($aIdPar, $oBD, $properties) {
+        $oBD = new BD($properties["cadastre"]["rp"]["login"], $properties["cadastre"]["rp"]["pass"], $properties["database"], $properties["server"], $properties["port"], $properties["sgbd"], $properties["page_encoding"]);
+        if (is_null($oBD->connexion)) {
+            $this->sStatus = 1;
+            $this->sMessage = "Connexion impossible avec " . $properties["cadastre"]["rp"]["login"];
+            writeToErrorLog($this->sMessage);
+            return null;
+        }
+        $i = 0;
+        while ($aIdPar[$i]) {
+            array_push($this->aObjects, new Mj_Bati_Parcelle($aIdPar[$i], $oBD));
+            $i++;
+        }
+    }
+
+    /**
+     * \brief Cette m�thode permet de construire un tableau.
+     * \return Retourne un tableau associatif.
+     */
+    function getExportFields() {
+        $aExportFields = array();
+        $aExportFields['sum_contenance_m2'] = $this->getSurfaceCadastraleM2();
+        $aExportFields['sum_valeur_locative'] = $this->getValeurLocative();
+        return $aExportFields;
+    }
+
+    /**
+     * \brief R�cup�ration de la surface totale des parcelles en mettre carr�.
+     */
+    function getSurfaceCadastraleM2() {
+        $dSurfaceCadastraleM2 = 0;
+        foreach ($this->getObjects('Mj_Bati_Parcelle') as $oBatiPar) {
+            $aFields = $oBatiPar->getExportFields();
+            $dSurfaceCadastraleM2 = ((int) $aFields['contenance']) + $dSurfaceCadastraleM2;
+        }
+        return $dSurfaceCadastraleM2;
+    }
+
+    /**
+     * \brief R�cup�ration des valeurs locatives
+     */
+    function getValeurLocative() {
+        $dValeurLocative = 0;
+        foreach ($this->getObjects('Mj_Bati_Parcelle') as $oBatiPar) {
+            $aFields = $oBatiPar->getExportFields();
+            $dValeurLocative = $aFields['total_valeur_locative'] + $dValeurLocative;
+        }
+        return $dValeurLocative;
+    }
+
+}
+
+?>
\ No newline at end of file
diff --git a/src/module_cadastreV2/web_service/class/majic_libV2/Mj_Compte_Communal.class.inc b/src/module_cadastreV2/web_service/class/majic_libV2/Mj_Compte_Communal.class.inc
new file mode 100755
index 0000000000000000000000000000000000000000..b06f5126ed6d3509033ccd6ee3d8ac6206f3591a
--- /dev/null
+++ b/src/module_cadastreV2/web_service/class/majic_libV2/Mj_Compte_Communal.class.inc
@@ -0,0 +1,789 @@
+<?php
+
+/**
+ * \file Mj_Compte_Communal.class.inc
+ * \brief Mj_Compte_Communal.class.inc \n \n Ce fichier contient la classe php Mj_Compte_Communal
+ * 
+ * Cette classe permet de sélectionner les attributs nécessaires afin de traiter la partie compte communal.
+ *
+ * \author Damien Bedel 
+ * \author Olivier Gayte <olivier.gayte@veremes.com>
+ */
+require_once ("Mj.class.inc");
+require_once ("Mj_Proprietaire.class.inc");
+require_once ("Mj_Bati.class.inc");
+require_once ("Mj_Parcelle.class.inc");
+
+class Mj_Compte_Communal extends Mj {
+
+    /**
+     * Tableau associatif comportant la liste des objets Proprietaire d'un compte communal.
+     */
+    var $aPro = array();
+
+    /**
+     * Tableau associatif comportant la liste des objets Bati d'un compte communal.
+     */
+    var $aBat = array();
+
+    /**
+     * Tableau associatif comportant la liste des objets Non Bati d'un compte communal.
+     */
+    var $aPar = array();
+
+    /**
+     * Chaine qui stocke l'année de référence des données casdatrales.
+     */
+    var $sAnneeReference;
+
+    /**
+     * \param $sIdDnupro Identifiant national de compte communal
+     * \param $oBD Objet de connexion PDO_BD
+     */
+    function __construct($sIdDnupro, $oBD, $properties, $sEncryptKey = '') {
+        $oBD = new BD($properties["cadastre"]["rp"]["login"], $properties["cadastre"]["rp"]["pass"], $properties["database"], $properties["server"], $properties["port"], $properties["sgbd"], $properties["page_encoding"]);
+        if (is_null($oBD->connexion)) {
+            $this->sStatus = 1;
+            $this->sMessage = "Connexion impossible avec " . $properties["cadastre"]["rp"]["login"];
+            writeToErrorLog($this->sMessage);
+            return null;
+        }
+        $this->sEncryptKey = $sEncryptKey;
+        include $this->sRessourcesFile;
+        $this->sSql = $aSql[$oBD->sgbd]['compte_communal'];
+        $this->sSql = str_replace('$sIdDnupro', $this->encrypt($sIdDnupro), $this->sSql);
+        $oPDOresult = $oBD->execute($this->sSql);
+        if ($oBD->enErreur()) {
+            $this->sStatus = 1;
+            $this->sMessage = $oBD->getBDMessage();
+        } else {
+            $this->sStatus = 0;
+            $this->aFields = $oBD->ligneSuivante($oPDOresult);
+            $this->aFields['id_dnupro'] = $sIdDnupro;
+        }
+        $oPDOresult = $oBD->fermeResultat();
+        $this->aPro = $this->get_aPro($oBD);
+        $this->aBat = $this->get_aBat($oBD);
+        $this->aPar = $this->get_aPar($oBD);
+        $this->sSql = $aSql[$oBD->sgbd]['annee_reference'];
+        $oPDOresult = $oBD->execute($this->sSql);
+        if ($oBD->erreurRencontree != 0) {
+            $this->sStatus = 1;
+            $this->sMessage = $oBD->getBDMessage();
+        } else {
+            $aAnneeReference = $oBD->ligneSuivante($oPDOresult);
+            $this->sAnneeReference = $aAnneeReference['annee'];
+        }
+        $this->aObjects = array_merge($this->aPro, $this->aBat, $this->aPar);
+    }
+
+    /**
+     * Cette méthode permet de récupérer les ID_PRO en fonction d'un ID_DNUPRO donné.
+     * \return Retourne un tableau de ID_PRO.
+     */
+    function get_aId_Pro($oBD) {
+        if ($this->isEmpty()) {
+            $aIdPro = "";
+        } else {
+            include $this->sRessourcesFile;
+            $aIdPro = array();
+            $this->sSql = $aSql[$oBD->sgbd]['get_id_pro'];
+            $this->sSql = str_replace('$sIdDnupro', $this->encrypt($this->aFields['id_dnupro']), $this->sSql);
+
+            $oPDOresult = $oBD->execute($this->sSql);
+            if ($oBD->enErreur()) {
+                $this->sStatus = 1;
+                $this->sMessage = $oBD->getBDMessage();
+            } else {
+                while ($aResultFetch = $oBD->tableauSuivant($oPDOresult)) {
+                    array_push($aIdPro, $aResultFetch[0]);
+                    $this->sStatus = 0;
+                }
+            }
+        }
+        return $aIdPro;
+        $oPDOresult = $oBD->fermeResultat();
+    }
+
+    /**
+     * Cette méthode permet de récupérer la liste des objets Proprietaire
+     * \param $oBD Objet de connexion PDO_BD
+     * \return Retourne un tableau d'objets Proprietaire
+     */
+    function get_aPro($oBD) {
+        $aPro = array();
+        if ($this->isEmpty()) {
+            $aPro = "";
+        } else {
+            $aIdPro = $this->get_aId_Pro($oBD);
+
+            foreach ($aIdPro as $sIdPro) {
+                array_push($aPro, new Mj_Proprietaire($this->aFields['id_dnupro'], $sIdPro, $oBD, $this->sEncryptKey));
+            }
+        }
+        return $aPro;
+    }
+
+    /**
+     * Cette méthode permet de récupérer les ID_BAT en fonction d'un ID_DNUPRO donné
+     * \param $oBD Objet de connexion PDO_BD
+     * \return Retourne un tableau de ID_BAT
+     */
+    function get_aId_Bat($oBD) {
+        if ($this->isEmpty()) {
+            $aIdBat = "";
+        } else {
+            include $this->sRessourcesFile;
+            $aIdBat = array();
+            $this->sSql = $aSql[$oBD->sgbd]['get_id_bat'];
+            $this->sSql = str_replace('$sIdDnupro', $this->aFields['id_dnupro'], $this->sSql);
+            $oPDOresult = $oBD->execute($this->sSql);
+            if ($oBD->enErreur()) {
+                $this->sStatus = 1;
+                $this->sMessage = $oBD->getBDMessage();
+            } else {
+                while ($aResultFetch = $oBD->tableauSuivant($oPDOresult)) {
+                    array_push($aIdBat, $aResultFetch[0]);
+                    $this->sStatus = 0;
+                }
+            }
+        }
+        return $aIdBat;
+    }
+
+    /**
+     * Cette méthode permet de récupérer la liste des objets BATI
+     * \param $oBD Objet de connexion PDO_BD
+     * \return Retourne un tableau d'objets BATI
+     */
+    function get_aBat($oBD) {
+        $aBat = array();
+        if ($this->isEmpty()) {
+            $aBat = "";
+        } else {
+            $aIdBat = $this->get_aId_Bat($oBD);
+            foreach ($aIdBat as $sIdBat) {
+                array_push($aBat, new Mj_Bati($sIdBat, $oBD, $this->sEncryptKey));
+            }
+        }
+        return $aBat;
+    }
+
+    /**
+     * Cette méthode permet de récupérer les ID_PAR en fonction d'un ID_DNUPRO donné
+     * \param $oBD Objet de connexion PDO_BD
+     * \return Retourne un tableau de ID_PAR
+     */
+    function get_aId_Par($oBD) {
+        if ($this->isEmpty()) {
+            $aIdPar = "";
+        } else {
+            include $this->sRessourcesFile;
+            $aIdPar = array();
+            $this->sSql = $aSql[$oBD->sgbd]['get_id_par'];
+            $this->sSql = str_replace('$sDnupro', $this->aFields['dnupro'], $this->sSql);
+            $this->sSql = str_replace('$sIdCom', $this->aFields['ccodep'] . $this->aFields['ccocom'], $this->sSql);
+            //$this->sSql=str_replace('$sIdDnupro', $this->aFields['id_dnupro'], $this->sSql);
+            $oPDOresult = $oBD->execute($this->sSql);
+            if ($oBD->enErreur()) {
+                $this->sStatus = 1;
+                $this->sMessage = $oBD->getBDMessage();
+            } else {
+                while ($aResultFetch = $oBD->tableauSuivant($oPDOresult)) {
+                    array_push($aIdPar, $aResultFetch[0]);
+                    $this->sStatus = 0;
+                }
+            }
+            $this->sSql = $aSql[$oBD->sgbd]['get_id_par_bnd'];
+            $this->sSql = str_replace('sIdDnupro', $this->aFields['id_dnupro'], $this->sSql);
+            $this->sSql = str_replace('sDnupro', substr($this->aFields['id_dnupro'], 6), $this->sSql);
+            $this->sSql = str_replace('sIdCom', $this->aFields['ccodep'] . $this->aFields['ccodir'] . $this->aFields['ccocom'], $this->sSql);
+            //$this->sSql=str_replace('$sIdDnupro', $this->aFields['id_dnupro'], $this->sSql);
+            $oPDOresult = $oBD->execute($this->sSql);
+            if ($oBD->enErreur()) {
+                $this->sStatus = 1;
+                $this->sMessage = $oBD->getBDMessage();
+            } else {
+                while ($aResultFetch = $oBD->tableauSuivant($oPDOresult)) {
+                    array_push($aIdPar, $aResultFetch[0]);
+
+                    $this->sStatus = 0;
+                }
+            }
+            $this->aExportFields = $this->getExportFields();
+        }
+        return $aIdPar;
+    }
+
+    /**
+     * Cette méthode permet de récupérer la liste des objets PARCELLE
+     * \param $oBD Objet de connexion PDO_BD
+     * \return Retourne un tableau d'objets PARCELLE
+     */
+    function get_aPar($oBD) {
+        $aPar = array();
+        if ($this->isEmpty()) {
+            $aPar = "";
+        } else {
+            $aIdPar = $this->get_aId_Par($oBD);
+            foreach ($aIdPar as $sIdPar) {
+                array_push($aPar, new Mj_Parcelle($oBD, $sIdPar, $this->aFields['id_dnupro']));
+            }
+        }
+        return $aPar;
+    }
+
+    /**
+     * Cette méthode permet de construire un tableau correspondant au relevé de propriété.
+     * \return Retourne un tableau associatif correspondant au relevé de propriété.
+     */
+    function getExportFields() {
+        $aExportFields = array();
+        if ($this->isEmpty()) {
+            $aExportFields = "";
+        } else {
+            $aExportFields['codeinsee'] = $this->aFields['codeinsee'];
+            $aExportFields['annee_de_maj'] = $this->sAnneeReference;
+            $aExportFields['dep_dir'] = $this->getDepdir();
+            $aExportFields['code_dep'] = $this->aFields['ccodep'];
+            $aExportFields['code_com'] = $this->aFields['ccocom'];
+            $aExportFields['lib_dep'] = $this->aFields['libdep'];
+            $aExportFields['com'] = $this->getCom();
+            $aExportFields['libcom'] = $this->aFields['libcom'];
+            $aExportFields['role'] = "";
+            $aExportFields['vue'] = "";
+            $aExportFields['numero_communal'] = $this->aFields['dnupro'];
+            $aExportFields['rev_impo_bati'] = $this->getRevImpoBati();
+            $aExportFields['rev_impo_par'] = $this->getRevImpoPar();
+            $iContenance = 0;
+            foreach ($this->aPar as $oPar) {
+                $iContenance = $iContenance + $oPar->getContenance();
+            }
+            $aExportFields['total_contenance'] = $this->getTotalContenance();
+            $aExportFields['total_contenance_m2'] = $this->getTotalContenanceM2();
+            $aExportFields['total_revenu_cadastral'] = $this->getRevenuCadastralTotal();
+            $aExportFields['total_valeur_locative'] = $this->getValeurLocativeBati();
+            $aExportFields['emprise_totale_intersect'] = $this->getTotalContenanceBati();
+            $aExportFields['ha'] = intval($iContenance / 10000);
+            if ($aExportFields['ha'] == 0) {
+                $aExportFields['ha'] = ' ';
+            }
+
+            $aExportFields['a'] = intval(($iContenance % 10000) / 100);
+            $sContenanceA = $aExportFields['a'];
+            $sContenanceA = strval($sContenanceA);
+            $sTlenA = strlen($sContenanceA);
+            if ($aExportFields['ha'] == ' ' and $aExportFields['a'] == 0) {
+                $aExportFields['a'] = ' ';
+            } else {
+                if ($aExportFields['ha'] == ' ' and $sTlenA == 2 and substr($aExportFields['a'], 0, 1) == 0) {
+                    $sDeuxiemeValeur = substr($aExportFields['a'], 1, 1);
+                    $aExportFields['a'] = ' ' . $sDeuxiemeValeur;
+                } else {
+                    if ($aExportFields['ha'] != ' ' and $sTlenA == 1) {
+                        $aExportFields['a'] = '0' . $aExportFields['a'];
+                    }
+                }
+            }
+            $aExportFields['ca'] = $iContenance % 100;
+            $sContenanceCa = $aExportFields['ca'];
+            $sContenanceCa = strval($sContenanceCa);
+            $sTlen = strlen($sContenanceCa);
+            if ($aExportFields['a'] != 0)
+                if ($sTlen == 1) {
+                    $aExportFields['ca'] = '0' . $aExportFields['ca'];
+                }
+            $aExportFields['exo_com_bati'] = $this->getExoComBati();
+            $aExportFields['rev_impo_com_bati'] = $this->getRevImpoComBati();
+            $aExportFields['exo_dep_bati'] = $this->getExoDepBati();
+            $aExportFields['rev_impo_dep_bati'] = $this->getRevImpoDepBati();
+            $aExportFields['exo_reg_bati'] = $this->getExoRegBati();
+            $aExportFields['rev_impo_reg_bati'] = $this->getRevImpoRegBati();
+            $aExportFields['exo_com_par'] = $this->getExoComPar();
+            $aExportFields['rev_impo_com_par'] = $this->getRevImpoComPar();
+            //$aExportFields['exo_dep_reg_par']=$this->getExoDepRegPar();
+            //$aExportFields['rev_impo_dep_reg_par']=$this->getRevImpoDepRegPar();
+            $aExportFields['exo_dep_par'] = $this->getExoDepPar();
+            $aExportFields['rev_impo_dep_par'] = $this->getRevImpoDepPar();
+            $aExportFields['exo_reg_par'] = $this->getExoRegPar();
+            $aExportFields['rev_impo_reg_par'] = $this->getRevImpoRegPar();
+            //modif float
+            $aExportFields['rev_impo_bati_float'] = $this->getRevImpoBatifloat();
+            $aExportFields['rev_impo_par_float'] = $this->getRevImpoParfloat();
+            $aExportFields['exo_com_bati_float'] = $this->getExoComBatifloat();
+            $aExportFields['rev_impo_com_bati_float'] = $this->getRevImpoComBatifloat();
+            $aExportFields['exo_dep_bati_float'] = $this->getExoDepBatifloat();
+            $aExportFields['rev_impo_dep_bati_float'] = $this->getRevImpoDepBatifloat();
+            $aExportFields['exo_reg_bati_float'] = $this->getExoRegBatifloat();
+            $aExportFields['rev_impo_reg_bati_float'] = $this->getRevImpoRegBatifloat();
+            $aExportFields['exo_com_par_float'] = $this->getExoComParfloat();
+            $aExportFields['rev_impo_com_par_float'] = $this->getRevImpoComParfloat();
+            //$aExportFields['exo_dep_reg_par_float']=$this->getExoDepRegParfloat();
+            //$aExportFields['rev_impo_dep_reg_par_float']=$this->getRevImpoDepRegParfloat();
+            $aExportFields['exo_dep_par_float'] = $this->getExoDepParfloat();
+            $aExportFields['rev_impo_dep_par_float'] = $this->getRevImpoDepParfloat();
+            $aExportFields['exo_reg_par_float'] = $this->getExoRegParfloat();
+            $aExportFields['rev_impo_reg_par_float'] = $this->getRevImpoRegParfloat();
+            $aExportFields['exo_tax_ad_par_float'] = $this->getExoTaxeADParfloat();
+            $aExportFields['rev_impo_tax_ad_par_float'] = $this->getRevImpoTaxeADParfloat();
+            $aExportFields['exo_tax_ad_par'] = $this->getExoTaxeADPar();
+            $aExportFields['rev_impo_tax_ad_par'] = $this->getRevImpoTaxeADPar();
+        }
+        return $aExportFields;
+    }
+
+    /**
+     * Cette méthode permet de concaténer les attributs ccodep et ccodir.
+     * /return Retourne une chaîne de caractères correspondant au DEP DIR du RP.
+     */
+    function getDepdir() {
+        $sDepdir = $this->aFields['ccodep'] . " " . $this->aFields['ccodir'];
+        return $sDepdir;
+    }
+
+    /**
+     * Cette méthode permet de concaténer les attributs ccocom et libcom.
+     * /return Retourne une chaîne de carcatères correspondant au COM du RP.
+     */
+    function getCom() {
+        $sCom = $this->aFields['ccocom'] . " " . $this->aFields['libcom'];
+        return $sCom;
+    }
+
+    /**
+     * Cette méthode permet de calculer le revenu imposable total du bâti.
+     * \return Retourne un entier.
+     */
+    function getRevImpoBati() {
+        $iRevImpoBati = 0;
+        foreach ($this->aBat as $oBat) {
+            $iRevImpoBati = $iRevImpoBati + (int) $oBat->getRevenuCadastral();
+            ;
+        }
+        return $iRevImpoBati;
+    }
+
+    /**
+     * Cette méthode permet de calculer le revenu imposable total du bâti.
+     * \return Retourne un float.
+     */
+    function getRevImpoBatifloat() {
+        $fRevImpoBati = 0;
+        foreach ($this->aBat as $oBat) {
+            $fRevImpoBati = $fRevImpoBati + (float) $oBat->getRevenuCadastralfloat();
+            ;
+        }
+        return $fRevImpoBati;
+    }
+
+    /**
+     * Cette méthode permet de calculer l'exonération communale totale du bâti.
+     * \return Retourne un entier
+     */
+    function getExoComBati() {
+        $iExoComBati = 0;
+        foreach ($this->aBat as $oBat) {
+            $iExoComBati = $iExoComBati + $oBat->getExoneration($oPro->aFields['l_ccodem']);
+        }
+        return $iExoComBati;
+    }
+
+    /**
+     * Cette méthode permet de calculer l'exonération communale totale du bâti.
+     * \return Retourne un float
+     */
+    function getExoComBatifloat() {
+        $fExoComBati = 0;
+        foreach ($this->aBat as $oBat) {
+            $fExoComBati = $fExoComBati + $oBat->getExonerationfloat($oPro->aFields['l_ccodem']);
+        }
+        return $fExoComBati;
+    }
+
+    /**
+     * Cette méthode permet de calculer le revenu imposable communal du bâti en fonction du revenu imposable total (bâti) et de l'exonération communale totale (bâti).
+     * \return Retourne un entier.
+     */
+    function getRevImpoComBati() {
+        $iRevImpoComBati = $this->getRevImpoBati() - $this->getExoComBati($oPro->aFields['l_ccodem']);
+        return $iRevImpoComBati;
+    }
+
+    /**
+     * Cette méthode permet de calculer le revenu imposable communal du bâti en fonction du revenu imposable total (bâti) et de l'exonération communale totale (bâti).
+     * \return Retourne un float.
+     */
+    function getRevImpoComBatifloat() {
+        $fRevImpoComBati = $this->getRevImpoBatifloat() - $this->getExoComBatifloat($oPro->aFields['l_ccodem']);
+        return $fRevImpoComBati;
+    }
+
+    /**
+     * Cette méthode permet de calculer l'exonération départementale totale du bâti.
+     * \return Retourne un entier
+     */
+    function getExoDepBati() {
+        $iExoDepBati = 0;
+        foreach ($this->aBat as $oBat) {
+            $iExoDepBati = $iExoDepBati + $oBat->getExoneration($oPro->aFields['l_ccodem']);
+        }
+        return $iExoDepBati;
+    }
+
+    /**
+     * Cette méthode permet de calculer l'exonération départementale totale du bâti.
+     * \return Retourne un float
+     */
+    function getExoDepBatifloat() {
+        $fExoDepBati = 0;
+        foreach ($this->aBat as $oBat) {
+            $fExoDepBati = $fExoDepBati + $oBat->getExonerationfloat($oPro->aFields['l_ccodem']);
+        }
+        return $fExoDepBati;
+    }
+
+    /**
+     * Cette méthode permet de calculer le revenu imposable départemental du bâti en fonction du revenu imposable total (bâti) et de l'exonération départemantale totale (bâti).
+     * \return Retourne un entier.
+     */
+    function getRevImpoDepBati() {
+        $iRevImpoDepBati = $this->getRevImpoBati() - $this->getExoDepBati();
+        return $iRevImpoDepBati;
+    }
+
+    /**
+     * Cette méthode permet de calculer le revenu imposable départemental du bâti en fonction du revenu imposable total (bâti) et de l'exonération départemantale totale (bâti).
+     * \return Retourne un float.
+     */
+    function getRevImpoDepBatifloat() {
+        $fRevImpoDepBati = $this->getRevImpoBatifloat() - $this->getExoDepBatifloat();
+        return $fRevImpoDepBati;
+    }
+
+    /**
+     * Cette méthode permet de calculer l'exonération régionale totale du bâti.
+     * \return Retourne un entier
+     */
+    function getExoRegBati() {
+        $iExoRegBati = 0;
+        foreach ($this->aBat as $oBat) {
+            $iExoRegBati = $iExoRegBati + $oBat->getExoneration($oPro->aFields['l_ccodem']);
+        }
+        return $iExoRegBati;
+    }
+
+    /**
+     * Cette méthode permet de calculer l'exonération régionale totale du bâti.
+     * \return Retourne un float
+     */
+    function getExoRegBatifloat() {
+        $fExoRegBati = 0;
+        foreach ($this->aBat as $oBat) {
+            $fExoRegBati = $fExoRegBati + $oBat->getExonerationfloat($oPro->aFields['l_ccodem']);
+        }
+        return $fExoRegBati;
+    }
+
+    /**
+     * Cette méthode permet de calculer le revenu imposable régional du bâti en fonction du revenu imposable total (bâti) et de l'exonération régionale totale (bâti).
+     * \return Retourne un entier.
+     */
+    function getRevImpoRegBati() {
+        $iRevImpoRegBati = $this->getRevImpoBati() - $this->getExoRegBati();
+        return $iRevImpoRegBati;
+    }
+
+    /**
+     * Cette méthode permet de calculer le revenu imposable régional du bâti en fonction du revenu imposable total (bâti) et de l'exonération régionale totale (bâti).
+     * \return Retourne un float.
+     */
+    function getRevImpoRegBatifloat() {
+        $fRevImpoRegBati = $this->getRevImpoBatifloat() - $this->getExoRegBatifloat();
+        return $fRevImpoRegBati;
+    }
+
+    /**
+     * Cette méthode permet de calculer l'emprise bâtie totale des parcelles.
+     * \return Retourne un entier.
+     */
+    function getTotalContenanceBati() {
+        $iContenance = 0;
+        foreach ($this->aPar as $oPar) {
+            foreach ($oPar->aIntersect as $oIntersect) {
+                $iContenanceBati = $iContenanceBati + $oIntersect->getEmpriseTotale();
+            }
+        }
+        return $iContenanceBati;
+    }
+
+    /**
+     * Cette méthode permet de calculer le revenu imposable total des parcelles.
+     * \return Retourne un entier.
+     */
+    function getRevImpoPar() {
+        $fRevImpoPar = 0;
+        foreach ($this->aPar as $oPar) {
+            $fRevImpoPar = $fRevImpoPar + (float) $oPar->getRevenuCadastral();
+            $iRevImpoPar = round($fRevImpoPar);
+        }
+        return $iRevImpoPar;
+    }
+
+    /**
+     * Cette méthode permet de calculer le revenu imposable total des parcelles.
+     * \return Retourne un float.
+     */
+    function getRevImpoParfloat() {
+        $fRevImpoPar = 0;
+        foreach ($this->aPar as $oPar) {
+            $fRevImpoPar = $fRevImpoPar + (float) $oPar->getRevenuCadastral();
+        }
+        return $fRevImpoPar;
+    }
+
+    /** DEPRECATED
+      /**
+     * Cette méthode permet de calculer l'exonération (départementale et régionale) totale des parcelles.
+     * \return Retourne un entier
+     */
+    /*
+      function getExoDepRegPar(){
+      $fExoDepRegPar=0;
+      foreach($this->aPar as $oPar){
+      $fExoDepRegPar=$fExoDepRegPar + $oPar->getRevenuCadastralAvecExo();
+      }
+      $iExoDepRegPar = round($fExoDepRegPar);
+      return $iExoDepRegPar;
+      }
+     */
+    /**
+     * Cette méthode permet de calculer le revenu imposable (départemental et régional) des parcelles en fonction du revenu imposable total (parcelles) et de l'exonération (départementale et régionale) totale (parcelles).
+     * \return Retourne un entier.
+     */
+    /*
+      function getRevImpoDepRegPar(){
+      $iRevImpoDepRegPar=$this->getRevImpoPar()-$this->getExoDepRegPar();
+      return $iRevImpoDepRegPar;
+      }
+     */
+
+    /**
+     * Cette méthode permet de calculer l'exonération départementale totale des parcelles.
+     * \return Retourne un entier
+     */
+    function getExoDepPar() {
+        $fExoDepPar = 0;
+        foreach ($this->aPar as $oPar) {
+            $fExoDepPar = $fExoDepPar + $oPar->getRevenuCadastralDepAvecExo();
+        }
+        $iExoDepPar = round($fExoDepPar);
+        return $iExoDepPar;
+    }
+
+    /**
+     * Cette méthode permet de calculer l'exonération départementale totale des parcelles.
+     * \return Retourne un float
+     */
+    function getExoDepParfloat() {
+        $fExoDepPar = 0;
+        foreach ($this->aPar as $oPar) {
+            $fExoDepPar = $fExoDepPar + $oPar->getRevenuCadastralDepAvecExo();
+        }
+        return $fExoDepPar;
+    }
+
+    /**
+     * Cette méthode permet de calculer le revenu imposable départemental des parcelles en fonction du revenu imposable total (parcelles) et de l'exonération (départementale et régionale) totale (parcelles).
+     * \return Retourne un entier.
+     */
+    function getRevImpoDepPar() {
+        $iRevImpoDepPar = $this->getRevImpoPar() - $this->getExoDepPar();
+        return $iRevImpoDepPar;
+    }
+
+    /**
+     * Cette méthode permet de calculer le revenu imposable départemental des parcelles en fonction du revenu imposable total (parcelles) et de l'exonération (départementale et régionale) totale (parcelles).
+     * \return Retourne un float.
+     */
+    function getRevImpoDepParfloat() {
+        $fRevImpoDepPar = $this->getRevImpoParfloat() - $this->getExoDepParfloat();
+        return $fRevImpoDepPar;
+    }
+
+    /**
+     * Cette méthode permet de calculer l'exonération régionale totale des parcelles.
+     * \return Retourne un entier
+     */
+    function getExoRegPar() {
+        $fExoRegPar = 0;
+        foreach ($this->aPar as $oPar) {
+            $fExoRegPar = $fExoRegPar + $oPar->getRevenuCadastralRegAvecExo();
+        }
+        $iExoRegPar = round($fExoRegPar);
+        return $iExoRegPar;
+    }
+
+    /**
+     * Cette méthode permet de calculer l'exonération régionale totale des parcelles.
+     * \return Retourne un float
+     */
+    function getExoRegParfloat() {
+        $fExoRegPar = 0;
+        foreach ($this->aPar as $oPar) {
+            $fExoRegPar = $fExoRegPar + $oPar->getRevenuCadastralRegAvecExo();
+        }
+        return $fExoRegPar;
+    }
+
+    /**
+     * Cette méthode permet de calculer le revenu imposable régional des parcelles en fonction du revenu imposable total (parcelles) et de l'exonération (départementale et régionale) totale (parcelles).
+     * \return Retourne un entier.
+     */
+    function getRevImpoRegPar() {
+        $iRevImpoRegPar = $this->getRevImpoPar() - $this->getExoRegPar();
+        return $iRevImpoRegPar;
+    }
+
+    /**
+     * Cette méthode permet de calculer le revenu imposable régional des parcelles en fonction du revenu imposable total (parcelles) et de l'exonération (départementale et régionale) totale (parcelles).
+     * \return Retourne un float.
+     */
+    function getRevImpoRegParfloat() {
+        $fRevImpoRegPar = $this->getRevImpoParfloat() - $this->getExoRegParfloat();
+        return $fRevImpoRegPar;
+    }
+
+    /**
+     * Cette méthode permet de calculer la contenance totale des parcelles.
+     * \return Retourne un entier.
+     */
+    function getTotalContenance() {
+        $iContenance = 0;
+        foreach ($this->aPar as $oPar) {
+            $iContenance = $iContenance + $oPar->aFields['dcntpa'];
+        }
+        return $iContenance;
+    }
+
+    /**
+     * Cette méthode permet de calculer la contenance totale des parcelles en mettre carré. 
+     * \return Retourne un entier.
+     */
+    function getTotalContenanceM2() {
+        $iContenanceM2 = 0;
+        foreach ($this->aPar as $oPar) {
+            $iContenanceM2 = $iContenanceM2 + $oPar->getContenance();
+        }
+        return $iContenanceM2;
+    }
+
+    /**
+     * Cette méthode permet de récupérer le revenu cadastral total des parcelles.
+     * \return Retourne un double
+     */
+    function getRevenuCadastralTotal() {
+        $dRevCadastralTotal = 0;
+        foreach ($this->aPar as $oPar) {
+            $dRevCadastralTotal = $dRevCadastralTotal + $oPar->getRevenuCadastral();
+        }
+        //$iRevCadastralTotal = round($dRevCadastralTotal);
+        return $dRevCadastralTotal;
+    }
+
+    /**
+     * Cette méthode permet de calculer l'éxonération communale totale des parcelles.
+     * \return Retourne 0;
+     */
+    function getExoComPar() {
+        $iExoComPar = 0;
+        foreach ($this->aPar as $oPar) {
+            $fExoComPar = $fExoComPar + $oPar->getRevenuCadastralComAvecExo();
+        }
+        $iExoComPar = round($fExoComPar);
+        return $iExoComPar;
+    }
+
+    /**
+     * Cette méthode permet de calculer l'éxonération communale totale des parcelles.
+     * \return Retourne 0;
+     */
+    function getExoComParfloat() {
+        $fExoComPar = 0;
+        foreach ($this->aPar as $oPar) {
+            $fExoComPar = $fExoComPar + $oPar->getRevenuCadastralComAvecExo();
+        }
+        return $fExoComPar;
+    }
+
+    /**
+     * Cette méthode permet de calculer le revenu imposable communal des parcelles en fonction du revenu imposable total (parcelles) et de l'exonération communale totale (parcelles).
+     * \return Retourne un entier.
+     */
+    function getRevImpoComPar() {
+        $iRevImpoComPar = $this->getRevImpoPar() - $this->getExoComPar();
+        return $iRevImpoComPar;
+    }
+
+    /**
+     * Cette méthode permet de calculer le revenu imposable communal des parcelles en fonction du revenu imposable total (parcelles) et de l'exonération communale totale (parcelles).
+     * \return Retourne un float.
+     */
+    function getRevImpoComParfloat() {
+        $fRevImpoComPar = $this->getRevImpoParfloat() - $this->getExoComParfloat();
+        return $fRevImpoComPar;
+    }
+
+    function getExoTaxeADPar() {
+        $iExoTaxeAdPar = 0;
+        foreach ($this->aPar as $oPar) {
+            $fExoTaxeADPar = $fExoTaxeADPar + $oPar->getRevenuCadastralTaxeADAvecExo();
+        }
+        $iExoTaxeADPar = round($fExoTaxeADPar);
+        return $iExoTaxeADPar;
+    }
+
+    /**
+     * Cette méthode permet de calculer l'éxonération des taxes additionnelles totale des parcelles.
+     * \return Retourne 0;
+     */
+    function getExoTaxeADParfloat() {
+        $fExoTaxeADPar = 0;
+        foreach ($this->aPar as $oPar) {
+            $fExoTaxeADPar = $fExoTaxeADPar + $oPar->getRevenuCadastralTaxeADAvecExo();
+        }
+        return $fExoTaxeADPar;
+    }
+
+    /**
+     * Cette méthode permet de calculer le revenu imposable des taxes additionnelles des parcelles en fonction du revenu imposable total (parcelles) et de l'exonération communale totale (parcelles).
+     * \return Retourne un entier.
+     */
+    function getRevImpoTaxeAdPar() {
+        $iRevImpoTaxeADPar = $this->getRevImpoPar() - $this->getExoTaxeADPar();
+        return $iRevImpoTaxeADPar;
+    }
+
+    /**
+     * Cette méthode permet de calculer le revenu imposable des taxes additionnelles des parcelles en fonction du revenu imposable total (parcelles) et de l'exonération communale totale (parcelles).
+     * \return Retourne un float.
+     */
+    function getRevImpoTaxeADParfloat() {
+        $fRevImpoTaxeADPar = $this->getRevImpoParfloat() - $this->getExoTaxeADParfloat();
+        return $fRevImpoTaxeADPar;
+    }
+
+    /**
+     * Cette méthode permet de récupérer la valeur locative totale du bâti.
+     * \return Retourne un double
+     */
+    function getValeurLocativeBati() {
+        $iValeurLocativeBati = 0;
+        foreach ($this->aBat as $oBat) {
+            $iValeurLocativeBati = $oBat->aFields['dvlpera'] + $iValeurLocativeBati;
+        }
+        return $iValeurLocativeBati;
+    }
+
+}
+
+?>
\ No newline at end of file
diff --git a/src/module_cadastreV2/web_service/class/majic_libV2/Mj_Compte_Communal_Parcelle.class.inc b/src/module_cadastreV2/web_service/class/majic_libV2/Mj_Compte_Communal_Parcelle.class.inc
new file mode 100755
index 0000000000000000000000000000000000000000..9de2b3fec3d52d229a02c910b730bb5575e27501
--- /dev/null
+++ b/src/module_cadastreV2/web_service/class/majic_libV2/Mj_Compte_Communal_Parcelle.class.inc
@@ -0,0 +1,163 @@
+<?php
+
+/**
+ * \file Mj_Compte_Communal_Parcelle.class.inc
+ * \brief Mj_Compte_Communal_Parcelle.class.inc \n \n Ce fichier contient la classe php Mj_Compte_Communal_Parcelle
+ *
+ * Cette classe permet de sélectionner les attributs nécessaires afin de traiter un relevé de propriété en fonction d'un compte communal et d'un numéro de parcelle.
+ *
+ * \author Damien Bedel
+ * \author Olivier Gayte <olivier.gayte@veremes.com>
+ */
+require_once ("Mj_Compte_Communal.class.inc");
+
+class Mj_Compte_Communal_Parcelle extends Mj_Compte_Communal {
+
+    /**
+     * Identifiant national de la parcelle sur 15 caractères.
+     */
+    var $sIdPar;
+
+    /**
+     * Booléen servant à savoir si on recherche une parcelle avec tout les batiments
+     */
+    var $bFP = false;
+    var $oBD;
+    var $sIdDnupro;
+
+    /**
+     * \param $sIdDnupro peut etre vide, un identifiant sera défini par une requete sql sur l'identifiant parcelle
+     * \param $sIdPar Identifiant de la parcelle.
+     * \param $oBD Objet de connexion PDO_BD
+     */
+    function __construct($sIdDnupro, $sIdPar, $oBD, $properties, $bFP = false, $sEncryptedKey = '', $AllSuf = false) {
+
+        $oBD = new BD($properties["cadastre"]["rp"]["login"], $properties["cadastre"]["rp"]["pass"], $properties["database"], $properties["server"], $properties["port"], $properties["sgbd"], $properties["page_encoding"]);
+        if (is_null($oBD->connexion)) {
+            $this->sStatus = 1;
+            $this->sMessage = "Connexion impossible avec " . $properties["cadastre"]["rp"]["login"];
+            writeToErrorLog($this->sMessage);
+            return null;
+        }
+        $this->bAllSuf = $AllSuf;
+        $this->sEncryptKey = $sEncryptedKey;
+        include $this->sRessourcesFile;
+        if ($sIdDnupro == "") {
+            $sSql = $aSql[$oBD->sgbd]['get_id_dnupro'];
+            $sSql = str_replace('idparpro', $sIdPar, $sSql);
+            $oPDOresult = $oBD->execute($sSql);
+            $aIdDnuProSql = $oBD->ligneSuivante($oPDOresult);
+            $sIdDnupro = $aIdDnuProSql['iddnupro'];
+            $sDnupro = $aIdDnuProSql['dnupro'];
+            $oPDOresult = $oBD->fermeResultat();
+        }
+        $this->sSql = $aSql[$oBD->sgbd]['compte_communal_parcelle'];
+        $this->sSql = str_replace('$sIdDnupro', $this->encrypt($sIdDnupro), $this->sSql);
+        $this->sSql = str_replace('$sIdPar', $sIdPar, $this->sSql);
+        $oPDOresult = $oBD->execute($this->sSql);
+        if ($oBD->enErreur()) {
+            $this->sStatus = 1;
+            $this->sMessage = $oBD->getBDMessage();
+        } else {
+            if ($aCompteCom = $oBD->ligneSuivante($oPDOresult)) {
+                $this->aFields = $aCompteCom;
+                $this->aFields['id_dnupro'] = $sIdDnupro;
+                //$this->aFields['dnupro']=$sIdDnupro;
+                $this->sStatus = 0;
+                $oPDOresult = $oBD->fermeResultat();
+                $this->aPro = $this->get_aPro($oBD);
+                $this->aBat = $this->get_aBat($oBD, $bFP);
+                $this->aPar = $this->get_aPar($oBD, $sIdPar, $sIdDnupro);
+                // récupération de l'année de référence
+                $this->sSql = $aSql[$oBD->sgbd]['annee_reference'];
+                $oPDOresult = $oBD->execute($this->sSql);
+                if ($oBD->enErreur()) {
+                    $this->sStatus = 1;
+                    $this->sMessage = $oBD->getBDMessage();
+                } else {
+                    $aAnneeReference = $oBD->ligneSuivante($oPDOresult);
+                    $this->sAnneeReference = $aAnneeReference['annee'];
+                }
+                $oPDOresult = $oBD->fermeResultat();
+                $this->aObjects = array_merge($this->aPro, $this->aBat, $this->aPar);
+            } else {
+                $this->sStatus = 1;
+                $this->sMessage = "Aucun compte communal trouvé pour la parcelle : " . $sIdPar;
+                $oPDOresult = $oBD->fermeResultat();
+            }
+        }
+    }
+
+    /**
+     * Cette méthode permet de récupérer les ID_BAT en fonction d'un ID_DNUPRO donné
+     * \return Retourne un tableau de ID_BAT
+     */
+    function get_aId_Bat($sIdPar, $oBD, $bFP) {
+        if ($this->isEmpty()) {
+            $aIdBat = "";
+        } else {
+            include $this->sRessourcesFile;
+            $aIdBat = array();
+            if (!$bFP) {
+                $this->sSql = $aSql[$oBD->sgbd]['get_id_bat_parcelle'];
+                $this->sSql = str_replace('$sIdDnupro', $this->aFields['id_dnupro'], $this->sSql);
+                $this->sSql = str_replace('$sIdPar', $this->aFields['id_par'], $this->sSql);
+            } else {
+                $this->sSql = $aSql[$oBD->sgbd]['get_par_id_bat'];
+                $this->sSql = str_replace('sIdPar', $this->aFields['id_par'], $this->sSql);
+            }
+            $oPDOresult = $oBD->execute($this->sSql);
+            if ($oBD->enErreur()) {
+                $this->sStatus = 1;
+                $this->sMessage = $oBD->getBDMessage();
+            } else {
+                while ($aResultFetch = $oBD->tableauSuivant($oPDOresult)) {
+                    array_push($aIdBat, $aResultFetch[0]);
+                    $this->sStatus = 0;
+                }
+            }
+        }
+        return $aIdBat;
+    }
+
+    /**
+     * Cette méthode permet de récupérer la liste des objets BATI
+     * \param $oBD Objet de connexion PDO_BD
+     * \return Retourne un tableau d'objets BATI
+     */
+    function get_aBat($oBD, $bFP) {
+        $aBat = array();
+        if ($this->isEmpty()) {
+            $aBat = "";
+        } else {
+            $aIdBat = $this->get_aId_Bat($sIdPar, $oBD, $bFP);
+            foreach ($aIdBat as $sIdBat) {
+                array_push($aBat, new Mj_Bati($sIdBat, $oBD, $this->sEncryptKey));
+            }
+        }
+        return $aBat;
+    }
+
+    /**
+     * Cette méthode permet de récupérer la liste des objets PARCELLE
+     * \param $oBD Objet de connexion PDO_BD
+     * \param $sIdPar Identifiant de la parcelle
+     * \param $sIdDnupro Identifiant du propriétaire
+     * \return Retourne un tableau d'objets PARCELLE
+     */
+    function get_aPar($oBD, $sIdPar, $sIdDnupro) {
+        $aPar = array();
+        if ($this->isEmpty()) {
+            $aPar = "";
+        } else {
+            $aIdPar = Array($sIdPar);
+            foreach ($aIdPar as $sIdPar) {
+                array_push($aPar, new Mj_Parcelle($oBD, $sIdPar, $sIdDnupro, $this->sEncryptKey, $this->bAllSuf));
+            }
+        }
+        return $aPar;
+    }
+
+}
+
+?>
\ No newline at end of file
diff --git a/src/module_cadastreV2/web_service/class/majic_libV2/Mj_Compte_Communal_Parcelles.class.inc b/src/module_cadastreV2/web_service/class/majic_libV2/Mj_Compte_Communal_Parcelles.class.inc
new file mode 100755
index 0000000000000000000000000000000000000000..bd59ddb534f108732759efbb1cc34105e8d1eed9
--- /dev/null
+++ b/src/module_cadastreV2/web_service/class/majic_libV2/Mj_Compte_Communal_Parcelles.class.inc
@@ -0,0 +1,135 @@
+<?php
+
+/**
+ * \file Mj_Bati_Parcelles.class.inc
+ * \brief Mj_Bati_Parcelles.class.inc \n \n Ce fichier contient la classe php Mj_Bati_Parcelles
+ *
+ * Cette classe permet de sélectionner les attributs nécessaires afin de traiter les batis associés à une parcelle.
+ *
+ * \author Damien Bedel
+ * \author Olivier Gayte <olivier.gayte@veremes.com>
+ */
+require_once ("Mj.class.inc");
+require_once ("Mj_Compte_Communal_Parcelle.class.inc");
+
+class Mj_Compte_Communal_Parcelles extends Mj {
+
+    /**
+     * \param $aIdPar Tableau Identifiants des parcelles
+     * \param $oBD Objet de connexion
+     * \param $properties Tableau des propriétés
+     * \param $sLayerTypeParcelle Chaine Type de géométrie des parcelles
+     */
+    function __construct($aIdPar, $oUserBD, $properties, $sLayerTypeParcelle) {
+        $oBD = new BD($properties["cadastre"]["rp"]["login"], $properties["cadastre"]["rp"]["pass"], $properties["database"], $properties["server"], $properties["port"], $properties["sgbd"], $properties["page_encoding"]);
+        if (is_null($oBD->connexion)) {
+            $this->sStatus = 1;
+            $this->sMessage = "Connexion impossible avec " . $properties["cadastre"]["rp"]["login"];
+            writeToErrorLog($this->sMessage);
+            return null;
+        }
+        $i = 0;
+        while ($aIdPar[$i]) {
+            array_push($this->aObjects, new Mj_Compte_Communal_Parcelle("", $aIdPar[$i], $oBD, $properties));
+            $i++;
+        }
+        foreach ($this->getObjects('Mj_Compte_Communal_Parcelle') as $oCptParcelle) {
+            foreach ($oCptParcelle->getObjects('Mj_Parcelle') as $oParcelle) {
+                $oParcelle->getEmprises($properties, $oUserBD, $sLayerTypeParcelle);
+                foreach ($oParcelle->getObjects('Mj_Emprises') as $oEmprises) {
+                    if ($oEmprises->isError()) {
+                        $this->sStatus = 1;
+                        $this->sMessage = "Erreur lors des récupérations des emprises, consulter le error.log";
+                        //error_log($oEmprises);
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * \brief Récupération de la surface totale des parcelles
+     */
+    function getSurfaceCadastrale() {
+        $dSurfaceCadastrale = 0;
+        foreach ($this->getObjects('Mj_Compte_Communal_Parcelle') as $oCptCom) {
+            $aFields = $oCptCom->getExportFields();
+            $dSurfaceCadastrale = $aFields['total_contenance'] + $dSurfaceCadastrale;
+        }
+        return $dSurfaceCadastrale;
+    }
+
+    /**
+     * \brief Récupération de la surface totale des parcelles en mettre carré
+     */
+    function getSurfaceCadastraleM2() {
+        $dSurfaceCadastraleM2 = 0;
+        foreach ($this->getObjects('Mj_Compte_Communal_Parcelle') as $oCptCom) {
+            $aFields = $oCptCom->getExportFields();
+            $dSurfaceCadastraleM2 = $aFields['total_contenance_m2'] + $dSurfaceCadastraleM2;
+        }
+        return $dSurfaceCadastraleM2;
+    }
+
+    /**
+     * \brief Récupération des revenus de la subdivision fiscale des parcelles
+     */
+    function getRevenuCadastral() {
+        $dRevenuCadastral = 0;
+        foreach ($this->getObjects('Mj_Compte_Communal_Parcelle') as $oCptCom) {
+            $aFields = $oCptCom->getExportFields();
+            $dRevenuCadastral = $aFields['total_revenu_cadastral'] + $dRevenuCadastral;
+        }
+        return $dRevenuCadastral;
+    }
+
+    /**
+     * \brief Récupération des valeurs locatives
+     */
+    function getValeurLocative() {
+        $dValeurLocative = 0;
+        foreach ($this->getObjects('Mj_Compte_Communal_Parcelle') as $oCptCom) {
+            $aFields = $oCptCom->getExportFields();
+            $dValeurLocative = $aFields['total_valeur_locative'] + $dValeurLocative;
+        }
+        return $dValeurLocative;
+    }
+
+    /**
+     * \brief Récupération de la emprises bâties totale des parcelles
+     */
+    function getSurfaceCadastraleBati() {
+        $dSurfaceCadastraleBati = 0;
+        foreach ($this->getObjects('Mj_Compte_Communal_Parcelle') as $oCptCom) {
+            foreach ($oCptCom->getObjects('Mj_Parcelle') as $oParcelle) {
+                foreach ($oParcelle->getObjects('Mj_Emprises') as $oEmprises) {
+                    $aFields = $oEmprises->getExportFields();
+                    if ($aFields['titre'] == "Emprise Bati") {
+                        $dSurfaceCadastraleBati = $aFields['emprise_totale_intersect'] + $dSurfaceCadastraleBati;
+                    }
+                }
+            }
+        }
+        return $dSurfaceCadastraleBati;
+    }
+
+    /**
+     * \brief Cette méthode permet de construire un tableau correspondant au relevé de propriété.
+     * \return Retourne un tableau associatif correspondant au relevé de propriété.
+     */
+    function getExportFields() {
+        $aExportFields = array();
+        if (!empty($this->aObjects)) {
+            //partie des sommes (surfaces,revenus,valeurs locatives)
+            $aExportFields['Sum_revenu'] = $this->getRevenuCadastral();
+            $aExportFields['Sum_contenance'] = $this->getSurfaceCadastrale();
+            $aExportFields['Sum_contenance_m2'] = $this->getSurfaceCadastraleM2();
+            $aExportFields['Sum_valeur_locative'] = $this->getValeurLocative();
+            $aExportFields['Sum_contenance_bati'] = $this->getSurfaceCadastraleBati();
+        }
+        return $aExportFields;
+    }
+
+}
+
+?>
\ No newline at end of file
diff --git a/src/module_cadastreV2/web_service/class/majic_libV2/Mj_Depend_Descr.class.inc b/src/module_cadastreV2/web_service/class/majic_libV2/Mj_Depend_Descr.class.inc
new file mode 100755
index 0000000000000000000000000000000000000000..e525d7bbea0fd8e5f9937d5287cc658181ab74db
--- /dev/null
+++ b/src/module_cadastreV2/web_service/class/majic_libV2/Mj_Depend_Descr.class.inc
@@ -0,0 +1,102 @@
+<?php
+/**
+* \file Mj_Depend_Descr.class.inc
+* \brief Mj_Depend_Descr.class.inc \n \n Ce fichier contient la classe php Mj_Depend_Descr
+* 
+* Cette classe permet de s�lectionner les attributs n�cessaires afin de traiter la partie Description D�pendance.
+*
+* \author John Bosch
+* \author Olivier Gayte <olivier.gayte@veremes.com>
+*/
+
+require_once ("Mj.class.inc");
+
+class Mj_Depend_Descr extends Mj {
+	/**
+	* \param $sIdDep Identifiant de la d�pendance
+	* \param $oBD Objet de connexion PDO_BD
+	*/
+	function __construct($sIdDep,$oBD){
+		include $this->sRessourcesFile;
+		$this->sSql=$aSql[$oBD->sgbd]['depend_descr'];
+		$this->sSql=str_replace('$sIdDep',$sIdDep,$this->sSql);
+		$oPDOresult=$oBD->execute($this->sSql);
+		if($oBD->enErreur()){
+			$this->sStatus=1;
+			$this->sMessage=$oBD->getBDMessage();
+		}else{
+			$this->aFields=$oBD->ligneSuivante($oPDOresult);
+			$this->sStatus=0;
+		}
+	}
+	/**
+	* Cette m�thode permet de construire un tableau correspondant au relev� de propri�t�/Fiche Parcelle.
+	* \return Retourne un tableau associatif correspondant au relev� de propri�t�/Fiche Parcelle.
+	*/
+	function getExportFields(){
+		$aExportFields=array();
+		if($this->isEmpty()){
+			$aExportFields="";
+		}else{
+			$aExportFields['num_invar']=$this->aFields['invar'];
+			$aExportFields['num_pev']=$this->aFields['dnupev'];
+			$aExportFields['num_depend']=$this->aFields['dnudes'];
+			$aExportFields['nature']=$this->aFields['l_cconad'];
+			$aExportFields['surface']=$this->aFields['dsudep'];
+			$aExportFields['ponderation']=$this->aFields['dcimlc'];
+			$aExportFields['Etat']=$this->aFields['detent'];
+			$aExportFields['l_Etat']=$this->aFields['l_detent'];
+			$aExportFields['mat_gros_mur']=$this->aFields['dmatgm'];
+			$aExportFields['lib_mat_gros_mur']=$this->aFields['lib_dmatgm'];
+			$aExportFields['mat_toiture']=$this->aFields['dmatto'];
+			$aExportFields['lib_mat_toiture']=$this->aFields['lib_dmatto'];
+			$aExportFields['nb_baignoires']=$this->aFields['dnbbai'];
+			$aExportFields['nb_douches']=$this->aFields['dnbdou'];
+			$aExportFields['nb_lavabos']=$this->aFields['dnblav'];
+			$aExportFields['nb_wc']=$this->aFields['dnbwc'];
+			$aExportFields['eau']=$this->getEau();
+			$aExportFields['elect']=$this->getElect();
+			$aExportFields['chauf']=$this->getChauf();
+		}
+		return $aExportFields;
+	}
+
+	/*
+	DEPRECATED 2013
+	function getNature(){
+		if ($this->aFields['cconad'] == "TR") {
+			return "Terrasse(s)";
+		}
+		if ($this->aFields['cconad'] == "CV") {
+			return "Cave(s)";
+		}
+		if ($this->aFields['cconad'] == "GR") {
+			return "Grenier(s)";
+		}
+		if ($this->aFields['cconad'] == "GA") {
+			return "Garage(s)";
+		}
+	}
+	*/
+
+	function getEau(){
+		if($this->aFields["geaulc"] == "O"){
+			return "EAU";
+		}
+	}
+
+	function getElect(){
+		if($this->aFields["gelelc"] == "O"){
+			return "ELECT";
+		}
+	}
+
+	function getChauf(){
+		if($this->aFields["gchclc"] == "O"){
+			return "CHAUF";
+		}
+	}
+
+}
+
+?>
\ No newline at end of file
diff --git a/src/module_cadastreV2/web_service/class/majic_libV2/Mj_Emprise.class.inc b/src/module_cadastreV2/web_service/class/majic_libV2/Mj_Emprise.class.inc
new file mode 100755
index 0000000000000000000000000000000000000000..2ff7cf3dcd698e721a08929146ab3578334fde06
--- /dev/null
+++ b/src/module_cadastreV2/web_service/class/majic_libV2/Mj_Emprise.class.inc
@@ -0,0 +1,101 @@
+<?php
+
+/**
+* \file Mj_Emprise.class.inc
+* \brief Mj_Emprise.class.inc \n \n Ce fichier contient la classe php Mj_Emprise
+* 
+* Cette classe permet de s�lectionner les attributs n�cessaires afin de traiter la partie parcelle. 
+*
+* \author Nicolas Chazeau
+* \author Olivier Gayte <olivier.gayte@veremes.com>
+*/
+
+/**
+* \class Mj_Emprise
+* \brief Mj_Emprise Class \n \n Mj_Emprise est une classe PHP qui h�rite de la classe Mj_Emprise.
+*
+* Cette classe permet de s�lectionner les attributs n�cessaires afin de traiter la partie Emprise. 
+*
+* \author Nicolas Chazeau
+* \author Olivier Gayte <olivier.gayte@veremes.com>
+*/
+require_once ("Mj.class.inc");
+require_once ("Mj_Attributes.class.inc");
+
+class Mj_Emprise extends Mj {
+
+	var $sIdEmprise="";
+	/**
+	* Tableau
+	*/
+	var $aAttributesEmprise= array();
+
+	/**
+	* Cette m�thode m�tier permet de r�cup�rer les informations sur les couches intersect�es par la surface de la parcelle interrog�e.
+	* \param $aField Tableau des noms de champs associ�es � la vue utilis�e.
+	* \param $aRow
+	* \param $iCompteur
+	* \param $iTolerance Valeur minimum de surface intersect� � partir de laquelle le contenu d'un enregistrement est affich�.
+	*/
+	function __construct($aField,$aRow,$iCompteur, $iTolerance) {
+		$aEmpriseParcelle= array();
+		switch(strtoupper($aField["type"])) {
+			case "POINT" :
+				$aEmpriseParcelle["intersectsuf"] = $aRow;
+				$this->sIdEmprise=$iCompteur;
+			break;
+			case "LINE" :
+				if(round($aRow["intersect"]) >= $iTolerance){
+					$aEmpriseParcelle["intersectsuf"] = $aRow;
+					$aEmpriseParcelle["intersectsuf"]["intersect_label"]= $aEmpriseParcelle["intersectsuf"]["intersect"]." m";
+					$this->sIdEmprise=$iCompteur;
+				}else{
+					$aEmpriseParcelle["intersectsuf"]["intersect"] = "0";
+					$aEmpriseParcelle["intersectsuf"]["intersect_label"] = "0 m";
+					$this->sIdEmprise=$iCompteur;
+				}
+			break;
+			case "POLYGON" :
+				if(round($aRow["intersect"]) >= $iTolerance){
+					$aEmpriseParcelle["intersectsuf"] = $aRow;
+					$aEmpriseParcelle["ratio"] = @(round(($aEmpriseParcelle["intersectsuf"]["intersect"] / $aEmpriseParcelle["intersectsuf"]["suf_parcelle"]), 2) * 100);
+					$aEmpriseParcelle["intersectsuf"]["intersect_label"].=$aEmpriseParcelle["intersectsuf"]["intersect"]." m�";
+					$aEmpriseParcelle["ratio_label"]=$aEmpriseParcelle["ratio"]." %";
+					$this->sIdEmprise=$iCompteur;
+				}else{
+					$aEmpriseParcelle["intersectsuf"]["intersect"]="0";
+					$aEmpriseParcelle["intersectsuf"]["intersect_label"]="0 m�";
+					$aEmpriseParcelle["ratio"]= "0";
+					$aEmpriseParcelle["ratio_label"]=$aEmpriseParcelle["ratio"]." %";
+					$this->sIdEmprise=$iCompteur;
+				}
+			break;
+		}
+		$this->aFields=$aEmpriseParcelle;
+		if(is_array($aEmpriseParcelle)){
+			array_push($this->aAttributesEmprise, new Mj_Attributes($aEmpriseParcelle,$aField));
+		}
+		$this->aObjects=$this->aAttributesEmprise;
+	}
+
+	/**
+	* Cette m�thode permet de construire un tableau correspondant au relev� de propri�t�.
+	* \return Retourne un tableau associatif correspondant au relev� de propri�t�.
+	*/
+	function getExportFields(){
+		$aExportFields=array();
+		if($this->isEmpty()){
+			$aExportFields="";
+		}else{
+			$aExportFields['emprise_intersect']=$this->aFields["intersectsuf"]["intersect"];
+			$aExportFields['emprise_intersect_label']=$this->aFields["intersectsuf"]["intersect_label"];
+			if($this->aFields["ratio"]){
+				$aExportFields['emprise_ratio']=$this->aFields["ratio"];
+				$aExportFields['emprise_ratio_label']=$this->aFields["ratio_label"];
+			}
+			$aExportFields['id_emprise']=$this->sIdEmprise;
+		}
+		return $aExportFields;
+	}
+
+}
\ No newline at end of file
diff --git a/src/module_cadastreV2/web_service/class/majic_libV2/Mj_Emprises.class.inc b/src/module_cadastreV2/web_service/class/majic_libV2/Mj_Emprises.class.inc
new file mode 100755
index 0000000000000000000000000000000000000000..4816d871834a1fb4e73cc99c5693747336ae0885
--- /dev/null
+++ b/src/module_cadastreV2/web_service/class/majic_libV2/Mj_Emprises.class.inc
@@ -0,0 +1,147 @@
+<?php
+
+/**
+* \file Mj_Emprises.class.inc
+* \brief Mj_Emprises.class.inc \n \n Ce fichier contient la classe php Mj_Emprises
+*
+* Cette classe permet de sélectionner les attributs nécessaires afin de traiter la partie parcelle.
+*
+* \author Nicolas Chazeau
+* \author Olivier Gayte <olivier.gayte@veremes.com>
+*/
+
+/**
+* \class Mj_Emprises
+* \brief Mj_Emprises Class \n \n Mj_Emprises est une classe PHP qui hérite de la classe Mj_Parcelle.
+*
+* Cette classe permet de sélectionner les attributs nécessaires afin de traiter la partie Emprises.
+*
+* \author Nicolas Chazeau
+* \author Olivier Gayte <olivier.gayte@veremes.com>
+*/
+require_once ("Mj.class.inc");
+require_once ("Mj_Parcelle.class.inc");
+require_once ("Mj_Emprise.class.inc");
+
+class Mj_Emprises extends Mj {
+
+	/**
+	* Cette méthode métier permet de récupérer les informations sur les couches intersectées par la surface de la parcelle intérrogée.
+	* \param $oCadastre Objet classe Cadastre.
+	* \param $sIdPar Identifiant de la parcelle sélectionnée.
+	* \param $sView Vue Postgis à interroger.
+	* \param $iTolerance Valeur minimum de surface intersecté à partir de laquelle le contenu d'un enregistrement est affiché.
+	* \param $aField Tableau des noms de champs associées à la vue utilisée.
+	* \param $sLayerType Type de géométrie contenue dans la couche parcelle de référence.
+	* \param $sInclude Fichier de rendu (*.vhtml) à afficher en cas d'erreur.
+	* \param $sType (Facultatif) Paramètre signifiant si on veut un tableau HTML (par défaut) ou aucune mise en forme en sortie (valeurs possibles : HTML, TEXT).
+	* \private
+	* \return Un tableau HTML sous la forme d'une chaîne de caractères.
+	*/
+
+	/**
+	* Tableau associatif comportant la liste des objets Emprises d'une parcelle
+	*/
+	var $aEmprisesParcellesSuf=array();
+
+	function __construct($oBD, $sIdPar, $sView, $iTolerance, $aField, $sLayerType) {
+
+		$sFunction = "";
+		switch(strtoupper($aField["type"])) {
+			case "POINT" :
+				$sFunction.= "st_area2d";
+			break;
+			case "LINE" :
+			case "LINESTRING" :
+			case "MULTILINESTRING" :
+				$sFunction.= "st_length2d";
+			break;
+			case "POLYGON" :
+			case "MULTIPOLYGON" :
+				$sFunction.= "st_area2d";
+			break;
+		}
+		($sLayerType == "polygon") ? $sPrcTable = "s_cadastre.v_vmap_parcelle" : $sPrcTable = "s_cadastre.v_vmap_parcelle_point";
+
+		$sSameSRIDSql = "SELECT st_srid(".$sPrcTable.".geom) = st_srid(".$sView.".geom) as issamesrid FROM ".$sPrcTable.", ".$sView." LIMIT 1";
+		$iSameSRIDResult=$oBD->execute($sSameSRIDSql);
+		$aSameSRIDResult=$oBD->getResultTableAssoc($iSameSRIDResult);
+
+		$bIsSameSRID = false;
+		if (!empty($aSameSRIDResult[0])) {
+			if ($aSameSRIDResult[0]['issamesrid'] == true) {
+				$bIsSameSRID = true;
+			}
+		}
+
+		if ($bIsSameSRID) {
+			$sSql = "SELECT CAST(".$sFunction."(st_intersection(".$sPrcTable.".geom, ".$sView.".geom)) AS DECIMAL(10,1)) AS intersect, ";
+			$sSql.= "st_area2d(".$sPrcTable.".geom) AS suf_parcelle, ".$sView.".* FROM ".$sPrcTable.", ".$sView." WHERE ";
+			$sSql.= "st_intersects(".$sPrcTable.".geom, ".$sView.".geom) ";
+			$sSql.= "AND ".$sPrcTable.".id_par = '".$sIdPar."' ;";
+		} else {
+			$sSql = "SELECT CAST(".$sFunction."(st_intersection(".$sPrcTable.".geom, st_transform(".$sView.".geom, st_srid(".$sPrcTable.".geom)))) AS DECIMAL(10,1)) AS intersect, ";
+			$sSql.= "st_area2d(".$sPrcTable.".geom) AS suf_parcelle, ".$sView.".* FROM ".$sPrcTable.", ".$sView." WHERE ";
+			$sSql.= "st_intersects(".$sPrcTable.".geom, st_transform(".$sView.".geom, st_srid(".$sPrcTable.".geom))) ";
+			$sSql.= "AND ".$sPrcTable.".id_par = '".$sIdPar."' ;";
+		}
+
+		$iResult=$oBD->execute($sSql);
+		if ($oBD->enErreur()) {
+			$this->sStatus = 1;
+			$this->sMessage = $oBD->getBDMessage();
+		}else{
+			$i=0;
+			while($aRow = $oBD->ligneSuivante ($iResult)) {
+				$oEmprise=new Mj_Emprise($aField,$aRow,$i,$iTolerance);
+				if($oEmprise->aFields["intersectsuf"]["intersect"]!="0"){
+					array_push($this->aEmprisesParcellesSuf,$oEmprise);
+					$i++;
+				}
+			}
+			$iResult = $oBD->fermeResultat();
+		}
+		$aValue["titre"]=$aField["title"];
+		$aValue["type_geom"]=$aField["type"];
+		$this->aFields=$aValue;
+		$this->aObjects=$this->aEmprisesParcellesSuf;
+	}
+	/*
+	* Récupére l'emprise totale d'un ensemble d'emprise (bati ou pos ou servitude etc)
+	* \return décimal l'emprise totale
+	*/
+	function getEmpriseTotale() {
+		$dEmpriseTotale = 0;
+		foreach ($this->aEmprisesParcellesSuf as $oEmprise) {
+			$dEmpriseTotale = $dEmpriseTotale + (float) $oEmprise->aFields["intersectsuf"]["intersect"];
+		}
+		return $dEmpriseTotale;
+	}
+
+	function getEmpriseRatioTotale() {
+		$dEmpriseRatioTotale = 0;
+		foreach ($this->aEmprisesParcellesSuf as $oEmprise) {
+			$dEmpriseRatioTotale = $dEmpriseRatioTotale + (float) $oEmprise->aFields["ratio"];
+		}
+		return $dEmpriseRatioTotale;
+	}
+
+	/**
+	* Cette méthode permet de construire un tableau correspondant au relevé de propriété.
+	* \return Retourne un tableau associatif correspondant au relevé de propriété.
+	*/
+	function getExportFields(){
+		$aExportFields=array();
+		if($this->isEmpty()){
+			$aExportFields="";
+		}else{
+			$aExportFields['titre']=$this->aFields["titre"];
+			$aExportFields['type_geom']=$this->aFields["type_geom"];
+			$aExportFields['emprise_totale_intersect']=$this->getEmpriseTotale();
+			$aExportFields['emprise_totale_ratio']=$this->getEmpriseRatioTotale();
+		}
+		return $aExportFields;
+	}
+
+}
+?>
diff --git a/src/module_cadastreV2/web_service/class/majic_libV2/Mj_Exon_Suf.class.inc b/src/module_cadastreV2/web_service/class/majic_libV2/Mj_Exon_Suf.class.inc
new file mode 100755
index 0000000000000000000000000000000000000000..0d7f97aa975ce564703a290a7509d19910c01e14
--- /dev/null
+++ b/src/module_cadastreV2/web_service/class/majic_libV2/Mj_Exon_Suf.class.inc
@@ -0,0 +1,63 @@
+<?php
+
+/**
+* \file Mj_Exon_Suf.class.inc
+* \brief Mj_Exon_Suf.class.inc \n \n Ce fichier contient la classe php Mj_Exon_Suf
+* 
+* Cette classe permet de s�lectionner les attributs n�cessaires afin de traiter la partie Exon-Suf.
+*
+* \author Damien Bedel <damien.bedel@veremes.com>
+* \author Olivier Gayte <olivier.gayte@veremes.com>
+*/
+/**
+* \class Mj_Exon_Suf
+* \brief Mj_Exon_Suf Class \n \n Mj_Exon_Suf est une classe PHP qui h�rite de la classe Mj.
+*
+* Cette classe permet de s�lectionner les attributs n�cessaires afin de traiter la partie Exon-Suf.
+*
+* \author Damien Bedel <damien.bedel@veremes.com>
+* \author Olivier Gayte <olivier.gayte@veremes.com>
+*/
+require_once ("Mj.class.inc");
+
+class Mj_Exon_Suf extends Mj {
+	/**
+	* \param $sIdSuf Identifiant de l'exon�ration de la partie d'�valuation
+	* \param $sRnuexn Num�ro d'ordre d'exoneration temporaire
+	* \param $oBD Objet de connexion PDO_BD
+	*/
+	function __construct($sIdSuf,$sRnuexn,$oBD){
+		include $this->sRessourcesFile;
+		$this->sSql = $aSql[$oBD->sgbd]['exon_suf'];
+		$this->sSql = str_replace('$sIdSuf', $sIdSuf, $this->sSql);
+		$this->sSql = str_replace('$sRnuexn', $sRnuexn, $this->sSql);
+		$oPDOresult= $oBD->execute($this->sSql);
+		if ( $oBD->enErreur()) {
+			$this->sStatus=1;
+			$this->sMessage = $oBD->getBDMessage();
+		}else{
+			$this->aFields =  $oBD->ligneSuivante ($oPDOresult);
+			$this->sStatus=0;
+		}
+	}
+	/**
+	* Cette m�thode permet de construire un tableau correspondant au relev� de propri�t�.
+	* \return Retourne un tableau associatif correspondant au relev� de propri�t�.
+	*/
+	function getExportFields(){
+		$aExportFields=array();
+		if($this->isEmpty()){
+			$aExportFields="";
+		}else{
+			$aExportFields['rnuexn']=$this->aFields['rnuexn'];
+			$aExportFields['ccolloc']=$this->aFields['ccolloc'];
+			$aExportFields['nat_exo']=$this->aFields['gnexts'];
+			$aExportFields['jfinex']=$this->aFields['jfinex'];
+			$aExportFields['pexn']=$this->aFields['pexn'];
+			$aExportFields['rcexnba']=$this->aFields['rcexnba'];
+		}
+		return $aExportFields;
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/src/module_cadastreV2/web_service/class/majic_libV2/Mj_Exone_Pev.class.inc b/src/module_cadastreV2/web_service/class/majic_libV2/Mj_Exone_Pev.class.inc
new file mode 100755
index 0000000000000000000000000000000000000000..9d2b1a68b1de64d542a4ed8234d3c977eea39a45
--- /dev/null
+++ b/src/module_cadastreV2/web_service/class/majic_libV2/Mj_Exone_Pev.class.inc
@@ -0,0 +1,90 @@
+<?php
+/**
+* \file Mj_Exone_Pev.class.inc
+* \brief Mj_Exone_Pev.class.inc \n \n Ce fichier contient la classe php Mj_Exone_Pev
+* 
+* Cette classe permet de s�lectionner les attributs n�cessaires afin de traiter la partie Exone-Pev. 
+*
+* \author Damien Bedel <damien.bedel@veremes.com>
+* \author Olivier Gayte <olivier.gayte@veremes.com>
+*/
+/**
+* \class Mj_Exone_Pev
+* \brief Mj_Exone_Pev Class \n \n Mj_Exone_Pev est une classe PHP qui h�rite de la classe Mj.
+*
+* Cette classe permet de s�lectionner les attributs n�cessaires afin de traiter la partie Exone-Pev. 
+*
+* \author Damien Bedel <damien.bedel@veremes.com>
+* \author Olivier Gayte <olivier.gayte@veremes.com>
+*/
+require_once ("Mj.class.inc");
+
+class Mj_Exone_Pev extends Mj {
+	/**
+	* \param $sIdEx Identifiant de l'exon�ration de la partie d'�valuation
+	* \param $oBD Objet de connexion PDO_BD
+	*/
+	function __construct($sIdEx,$oBD){
+		include $this->sRessourcesFile;
+		$this->sSql = $aSql[$oBD->sgbd]['exone_pev'];
+		$this->sSql = str_replace('$sIdEx', $sIdEx, $this->sSql);
+		$oPDOresult= $oBD->execute($this->sSql);
+		if ($oBD->enErreur()) {
+			$this->sStatus=1;
+			$this->sMessage = $oBD->getBDMessage();  	
+		}else{
+			$this->aFields =  $oBD->ligneSuivante ($oPDOresult);
+			$this->sStatus=0;
+		}
+	}
+	/**
+	* Cette m�thode permet de construire un tableau correspondant au relev� de propri�t�.
+	* \return Retourne un tableau associatif correspondant au relev� de propri�t�.
+	*/
+	function getExportFields(){
+		$aExportFields=array();
+		if($this->isEmpty()){
+			$aExportFields="";
+		} 
+		else{
+			$aExportFields['coll']=$this->aFields['ccolloc'];
+			$aExportFields['nat_exo']=$this->aFields['gnextl'];
+			$aExportFields['an_ret']=$this->getAnret();
+			$aExportFields['an_deb']=$this->getAndeb();
+			$aExportFields['fraction_rc_exo']=$this->aFields['rcexba2'];
+			$aExportFields['pourc_exo']=$this->getPourcExo();
+			$aExportFields['tx_om']="<font color=red><b>Info Manquante</b></font>";
+			$aExportFields['coef']="<font color=red><b>Info Manquante</b></font>";
+		}
+		return $aExportFields;
+	}
+
+	/**
+	* Cette m�thode permet de r�cup�rer les deux derniers caract�res de l'attribut janimp.
+	* /return Retourne une cha�ne de caract�res.
+	*/
+	function getAnret(){
+		$sAnret=$this->aFields['janimp'];
+		$sAnret= substr("$sAnret", 2, 2);
+		return $sAnret;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer les deux derniers caract�res de l'attribut jandeb.
+	* /return Retourne une cha�ne de caract�res.
+	*/
+	function getAndeb(){
+		$sAndeb=$this->aFields['jandeb'];
+		$sAndeb= substr("$sAndeb", 2, 2);
+		return $sAndeb;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer le pourcentage d'�xon�ration � partir du champ 'pexb'.
+	* /return Retourne un entier
+	*/
+	function getPourcExo(){
+		$iPourcExo=(int)($this->aFields['pexb'])/100;
+		return $iPourcExo;
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/src/module_cadastreV2/web_service/class/majic_libV2/Mj_Habit_Descr.class.inc b/src/module_cadastreV2/web_service/class/majic_libV2/Mj_Habit_Descr.class.inc
new file mode 100755
index 0000000000000000000000000000000000000000..132112d50191a9df71172f0cc231fcd1b7f1fd52
--- /dev/null
+++ b/src/module_cadastreV2/web_service/class/majic_libV2/Mj_Habit_Descr.class.inc
@@ -0,0 +1,159 @@
+<?php
+/**
+* \file Mj_Habit_Descr.class.inc
+* \brief Mj_Habit_Descr.class.inc \n \n Ce fichier contient la classe php Mj_Habit_Descr
+* 
+* Cette classe permet de s�lectionner les attributs n�cessaires afin de traiter la partie Description Habitation.
+*
+* \author John Bosch
+* \author Olivier Gayte <olivier.gayte@veremes.com>
+*/
+
+require_once ("Mj.class.inc");
+
+class Mj_Habit_Descr extends Mj {
+	/**
+	* \param $aIdDescrHab Identifiants de la partie Description Habitation (id_pev et dnudes) 
+	* \param $oBD Objet de connexion PDO_BD
+	*/
+	function __construct($aIdDescrHab,$oBD){
+		include $this->sRessourcesFile;
+		$this->sSql=$aSql[$oBD->sgbd]['habit_descr'];
+		$this->sSql=str_replace('$sIdPev',$aIdDescrHab['id_pev'],$this->sSql);
+		$this->sSql=str_replace('$sDnudes',$aIdDescrHab['dnudes'],$this->sSql);
+		$oPDOresult=$oBD->execute($this->sSql);
+		if($oBD->enErreur()){
+			$this->sStatus=1;
+			$this->sMessage=$oBD->getBDMessage();
+		}else{
+			$this->aFields=$oBD->ligneSuivante($oPDOresult);
+			$this->sStatus=0;
+		}
+	}
+
+	/**
+	* Cette m�thode permet de construire un tableau correspondant au relev� de propri�t�/Fiche Parcelle.
+	* \return Retourne un tableau associatif correspondant au relev� de propri�t�/Fiche Parcelle.
+	*/
+	function getExportFields(){
+		$aExportFields=array();
+		if($this->isEmpty()){
+			$aExportFields="";
+		}else{
+			$aExportFields['num_invar']=$this->aFields['invar'];
+			$aExportFields['num_pev']=$this->aFields['dnupev'];
+			$aExportFields['garage']=$this->getGarage();
+			$aExportFields['suf_garage']=$this->aFields['dsueic1'];
+			$aExportFields['cave']=$this->getCave();
+			$aExportFields['suf_cave']=$this->aFields['dsueic2'];
+			$aExportFields['grenier']=$this->getGrenier();
+			$aExportFields['suf_grenier']=$this->aFields['dsueic3'];
+			$aExportFields['terrasse']=$this->getTerrasse();
+			$aExportFields['suf_terrasse']=$this->aFields['dsueic4'];
+			$aExportFields['nb_baignoires']=$this->aFields['dnbbai'];
+			$aExportFields['nb_douches']=$this->aFields['dnbdou'];
+			$aExportFields['nb_lavabos']=$this->aFields['dnblav'];
+			$aExportFields['nb_wc']=$this->aFields['dnbwc'];
+			$aExportFields['nb_piece_principal']=$this->aFields['dnbppr'];
+			$aExportFields['nb_sam']=$this->aFields['dnbsam'];
+			$aExportFields['nb_chambre']=$this->aFields['dnbcha'];
+			$aExportFields['nb_cuisine_m9']=$this->aFields['dnbcu8'];
+			$aExportFields['nb_cuisine_p9']=$this->aFields['dnbcu9'];
+			$aExportFields['nb_salle_eau']=$this->aFields['dnbsea'];
+			$aExportFields['nb_annexe']=$this->aFields['dnbann'];
+			$aExportFields['nb_piece_total']=$this->aFields['dnbpdc'];
+			$aExportFields['suf_piece_total']=$this->aFields['dsupdc'];
+			$aExportFields['mat_gros_mur']=$this->aFields['dmagtm'];
+			$aExportFields['lib_mat_gros_mur']=$this->aFields['lib_dmatgm'];
+			$aExportFields['mat_toiture']=$this->aFields['dmatto'];
+			$aExportFields['lib_mat_toiture']=$this->aFields['lib_dmatto'];
+			$aExportFields['annee_constr']=$this->aFields['jannat'];
+			$aExportFields['Etat']=$this->aFields['detent'];
+			$aExportFields['l_Etat']=$this->aFields['l_detent'];
+			$aExportFields['nb_niveaux']=$this->aFields['dnbniv'];
+			$aExportFields['eau']=$this->getEau();
+			$aExportFields['elect']=$this->getElect();
+			$aExportFields['esc_serv']=$this->getEsc();
+			$aExportFields['gaz']=$this->getGaz();
+			$aExportFields['asc']=$this->getAsc();
+			$aExportFields['chauf']=$this->getChauf();
+			$aExportFields['vide_ord']=$this->getVide();
+			$aExportFields['egout']=$this->getEgout();
+		}
+		return $aExportFields;
+	}
+
+	function getGarage(){
+		if ($this->aFields['cconad1'] == "GA"){
+			return "Garage(s)";
+		}
+	}
+
+	function getCave(){
+		if ($this->aFields['cconad2'] == "CV"){
+			return "Cave(s)";
+		}
+	}
+
+	function getGrenier(){
+		if ($this->aFields['cconad3'] == "GR"){
+			return "Greniers(s)";
+		}
+	}
+
+	function getTerrasse(){
+		if ($this->aFields['cconad4'] == "TR"){
+			return "Terrasse(s)";
+		}
+	}
+
+	function getEau(){
+		if ($this->aFields["geaulc"] == "O"){
+			return "EAU";
+		}
+	}
+
+	function getElect(){
+		if ($this->aFields["gelelc"] == "O"){
+			return "ELECT";
+		}
+	}
+
+	function getEsc(){
+		if ($this->aFields["gesclc"] == "O"){
+			return "ESC_SERV";
+		}
+	}
+
+	function getGaz(){
+		if ($this->aFields["ggazlc"] == "O"){
+			return "GAZ";
+		}
+	}
+
+	function getAsc(){
+		if ($this->aFields["gasclc"] == "O"){
+			return "ASC";
+		}
+	}
+
+	function getChauf(){
+		if ($this->aFields["gchclc"] == "O"){
+			return "CHAUF";
+		}
+	}
+
+	function getVide(){
+		if ($this->aFields["gvorlc"] == "O"){
+			return "VIDE_ORD";
+		}
+	}
+
+	function getEgout(){
+		if ($this->aFields["gteglc"] == "O"){
+			return "EGOUT";
+		}
+	}
+
+}
+?>
\ No newline at end of file
diff --git a/src/module_cadastreV2/web_service/class/majic_libV2/Mj_Lot_Local.class.inc b/src/module_cadastreV2/web_service/class/majic_libV2/Mj_Lot_Local.class.inc
new file mode 100755
index 0000000000000000000000000000000000000000..fdbb87b1d5c39509aca079cba920282bb2e7a199
--- /dev/null
+++ b/src/module_cadastreV2/web_service/class/majic_libV2/Mj_Lot_Local.class.inc
@@ -0,0 +1,66 @@
+<?php
+/**
+* \file Mj_Lot_Local.class.inc
+* \brief Mj_Lot_Local.class.inc \n \n Ce fichier contient la classe php Mj_Lot_Local
+* 
+* Cette classe permet de s�lectionner les attributs n�cessaires afin de traiter la partie lot-local.
+*
+* \author Damien Bedel
+* \author Olivier Gayte <olivier.gayte@veremes.com>
+*/
+/**
+* \class Mj_Lot_Local
+* \brief Mj_Lot_Local Class \n \n Mj_Lot_Local est une classe PHP qui h�rite de la classe Mj.
+*
+* Cette classe permet de s�lectionner les attributs n�cessaires afin de traiter la partie lot-local.
+*
+* \author Damien Bedel
+* \author Olivier Gayte <olivier.gayte@veremes.com>
+*/
+require_once ("Mj.class.inc");
+
+class Mj_Lot_Local extends Mj {
+	/**
+	* \param $sIdBat Identifiant de b�ti
+	* \param $sKlot Identifiant d'un lot
+	* \param $oBD Objet de connexion PDO_BD
+	*/
+	function __construct($sIdBat,$sKlot,$oBD){
+		include $this->sRessourcesFile;
+		$this->sSql=$aSql[$oBD->sgbd]['lot_local'];
+		$this->sSql=str_replace('$sIdBat', $sIdBat, $this->sSql);
+		$this->sSql=str_replace('$sKlot', $sKlot, $this->sSql);
+		$oPDOresult=$oBD->execute($this->sSql);
+		if ($oBD->enErreur()){
+			$this->sStatus=1;
+			$this->sMessage=$oBD->getBDMessage();
+		}else{
+			$this->aFields=$oBD->ligneSuivante ($oPDOresult);
+			$this->sStatus=0;
+		}
+	}
+	/**
+	* Cette m�thode permet de construire un tableau correspondant au relev� de propri�t�.
+	* \return Retourne un tableau associatif correspondant au relev� de propri�t�.
+	*/
+	function getExportFields(){
+		$aExportFields=array();
+		if($this->isEmpty()){
+			$aExportFields="";
+		}else{
+			$aExportFields['lot']=$this->getLot();
+		}
+		return $aExportFields;
+	}
+	/**
+	* Cette m�thode permet de concat�ner les diff�rents attributs d'un lot-local afin d'obtenir une seul chaine de caract�res.
+	* \return Retourne une chaine de caract�res.
+	*/
+	function getLot(){
+		$NumLot = (string) ((int) $this->aFields['dnulot']);
+		$sLot = $this->aFields['dnupdl']." LOT ".$NumLot." ".$this->aFields['dnumql']." /".$this->aFields['ddenql'];
+		return $sLot;
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/src/module_cadastreV2/web_service/class/majic_libV2/Mj_Parcelle.class.inc b/src/module_cadastreV2/web_service/class/majic_libV2/Mj_Parcelle.class.inc
new file mode 100755
index 0000000000000000000000000000000000000000..b263f2ca2cdd6ad4025dd6b5e5ecde58fec3b42f
--- /dev/null
+++ b/src/module_cadastreV2/web_service/class/majic_libV2/Mj_Parcelle.class.inc
@@ -0,0 +1,569 @@
+<?php
+/**
+* \file Mj_Parcelle.class.inc
+* \brief Mj_Parcelle.class.inc \n \n Ce fichier contient la classe php Mj_Parcelle
+* 
+* Cette classe permet de sélectionner les attributs nécessaires afin de traiter la partie parcelle. 
+*
+* \author Fabien Marty <fabien.marty@veremes.com>
+* \author Damien Bedel
+* \author Olivier Gayte <olivier.gayte@veremes.com>
+*/
+/**
+* \class Mj_Parcelle
+* \brief Mj_Parcelle Class \n \n Mj_Parcelle est une classe PHP qui hérite de la classe Mj.
+*
+* Cette classe permet de sélectionner les attributs nécessaires afin de traiter la partie parcelle. 
+*
+* \author Fabien Marty <fabien.marty@veremes.com>
+* \author Damien Bedel
+* \author Olivier Gayte <olivier.gayte@veremes.com>
+*/
+
+
+require_once ("Mj.class.inc");
+require_once ("Mj_Suf.class.inc");
+require_once ("Mj_Emprises.class.inc");
+require_once ("Mj_PosPlu.class.inc");
+
+class Mj_Parcelle extends Mj {
+	/**
+	* Tableau associatif comportant la liste des objets Suf d'une parcelle
+	*/
+	var $aSuf=array();
+	/**
+	* Tableau associatif comportant la liste des objets Emprises d'une parcelle 
+	*/
+	var $aIntersect=array();
+	/**
+	* Tableau associatif comportant la liste des objets PosPlu d'une parcelle
+	*/
+	var $aPosPlu=array();
+
+	/**
+	* Constructeur
+	* \param $oBD Objet de connexion PDO_BD
+	* \param $sIdPar Identifiant de la parcelle
+	* \param $sIdDnupro Identifiant du propriétaire
+	*/
+	function __construct($oBD,$sIdPar,$sIdDnupro,$sEncryptedKey='', $bAllSuf=false){
+		include $this->sRessourcesFile;
+		$this->sSql=$aSql[$oBD->sgbd]['parcelle'];
+		$this->sSql=str_replace('$sIdPar', $sIdPar, $this->sSql);
+		$oPDOresult=$oBD->execute($this->sSql);
+		if ($oBD->enErreur()){
+			$this->sStatus=1;
+			$this->sMessage=$oBD->getBDMessage();
+		}else{
+			if (!$this->aFields=$oBD->ligneSuivante ($oPDOresult)){
+				$this->sMessage='La parcelle "'.$sIdPar.'" n\'existe pas dans les données Majic.';
+				$this->sStatus=1;
+			}else{
+				$this->sStatus=0;
+			}
+		}
+		$aSuf=$this->get_aSuf($oBD,$sIdPar,$sIdDnupro, $sEncryptedKey, $bAllSuf);
+		
+		//$this->get_aPosPlu($oBD,$sIdPar);
+		if ($this->aPosPlu==""){
+			$this->aObjects=$this->aSuf;
+		}else{
+			$this->aObjects=array_merge ($this->aSuf, $this->aPosPlu);
+		}
+	}
+
+	/**
+	* Cette méthode permet de récupérer la liste des objets PosPlu d'une parcelle
+	* \param $oBD Objet de connexion PDO_BD
+	* \param $sIdPar Identifiant de la parcelle
+	* \return Retourne un tableau d'objets PosPlu
+	*/
+	function get_aPosPlu($oBD,$sIdPar){
+		$aPosPlu=array();
+		if($this->isEmpty()){
+			$this->aPosPlu="";
+		}else{
+			$sIdParpos = substr($sIdPar,3);
+			$sCodCom=$this->get_sCodCom($oBD,$sIdPar);
+			$aIdPosPlu=$this->get_aId_PosPlu($oBD,$sIdParpos,$sCodCom);
+			foreach($aIdPosPlu as $sIdPosPlu){
+				array_push($this->aPosPlu, new Mj_PosPlu($oBD,$sIdPosPlu, $sIdParpos,$sCodCom));
+			}
+		}
+		return $aPosPlu;
+	}
+	
+	function get_aId_PosPlu($oBD,$sIdPar,$sCodCom){
+		include $this->sRessourcesFile;
+		$aIdPosPlu=array();
+		$this->sSql=$aSql[$oBD->sgbd]['get_id_pos_plu'];
+		$this->sSql=str_replace('$sIdPar',$sIdPar,$this->sSql);
+		$this->sSql=str_replace('$sCodCom',$sCodCom,$this->sSql);
+		$oPDOresult=$oBD->execute($this->sSql);
+		if ($oBD->enErreur()){
+			$this->sStatus=1;
+			$this->sMessage=$oBD->getBDMessage();
+		}else{
+			while($aResultFetch=$oBD->tableauSuivant ($oPDOresult)){
+				
+				array_push($aIdPosPlu,$aResultFetch[0]);
+				$this->sStatus=0;
+			}
+		}
+		return $aIdPosPlu;
+	}
+	/**
+	* Cette méthode permet de récupérer le CodCom en fonction d'un Id_Par donné
+	* \param $oBD Objet de connexion PDO_BD
+	* \param $sIdPar Identifiant de la parcelle
+	* \return Retourne une chaîne de caractères
+	*/
+	function get_sCodCom($oBD,$sIdPar){
+		include $this->sRessourcesFile;
+		$aCodCom=array();
+		$this->sSql=$aSql[$oBD->sgbd]['get_codcom'];
+		$this->sSql=str_replace('$sIdPar',$sIdPar,$this->sSql);
+		$oPDOresult=$oBD->execute($this->sSql);
+		if ($oBD->enErreur()){
+			$this->sStatus=1;
+			$this->sMessage=$oBD->getBDMessage();
+		}else{
+			while($aResultFetch=$oBD->tableauSuivant ($oPDOresult)){
+				array_push($aCodCom,$aResultFetch[0]);
+				$this->sStatus=0;
+			}
+		}
+		$sCodCom=$aCodCom[0];
+		return $sCodCom;
+	}
+
+	/**
+	* Cette méthode permet de récupérer la liste des objets Suf d'une parcelle
+	* \param $oBD Objet de connexion PDO_BD
+	* \param $sIdPar Identifiant de la parcelle
+	* \param $sIdDnupro Identifiant du propriétaire
+	* \return Retourne un tableau d'objets Suf
+	*/
+	function get_aSuf($oBD,$sIdPar,$sIdDnupro,$sEncryptedKey='',$bAllSuf){
+		if($this->isEmpty()){
+			$this->aSuf="";
+		}else{
+			$aIdSuf=$this->get_aId_Suf($oBD,$sIdPar,$sIdDnupro);
+			foreach($aIdSuf as $sIdSuf){
+				array_push($this->aSuf,new Mj_Suf($oBD,$sIdSuf,$sIdDnupro,$sEncryptedKey,$bAllSuf));
+			}
+		}
+		return $aSuf;
+	}
+	/**
+	* Cette méthode permet de récupérer les Id_Suf en fonction d'un Id_Par donné
+	* \param $oBD Objet de connexion PDO_BD
+	* \param $sIdPar Identifiant de la parcelle
+	* \param $sIdDnupro Identifiant du propriétaire
+	* \return Retourne un tableau de chaînes de caractères
+	*/
+	function get_aId_Suf($oBD,$sIdPar,$sIdDnupro){
+		include $this->sRessourcesFile;
+		$aIdSuf=array();
+		$this->sSql=$aSql[$oBD->sgbd]['get_id_suf'];
+		$this->sSql=str_replace('sIdPar',$sIdPar,$this->sSql);
+		$this->sSql=str_replace('sIdDnupro',$sIdDnupro,$this->sSql);
+		$this->sSql=str_replace('sDnupro',substr($sIdDnupro,5),$this->sSql);
+		$oPDOresult=$oBD->execute($this->sSql);
+		if ($oBD->enErreur()){
+			$this->sStatus=1;
+			$this->sMessage=$oBD->getBDMessage();
+		}else{
+			while($aResultFetch=$oBD->tableauSuivant ($oPDOresult)){
+				array_push($aIdSuf,$aResultFetch[0]);
+				$this->sStatus=0;
+			}
+		}
+		return $aIdSuf;
+	}
+	/**
+	* Cette méthode permet de construire un tableau correspondant au relevé de propriété.
+	* \return Retourne un tableau associatif correspondant au relevé de propriété.
+	*/
+	function getExportFields(){
+		$aExportFields=array();
+		if($this->isEmpty()){
+			$aExportFields="";
+		}else{
+			$aExportFields['dateheure']=date("d/m/Y")." a ".date("H:m");
+			$aExportFields['idpar']=$this->aFields['id_par'];
+			$aExportFields['date']=$this->getJdatat();
+			$aExportFields['section']=$this->aFields['ccosec'];
+			$aExportFields['num_plan']=$this->aFields['dnupla'];
+			$aExportFields['num_parc']=$this->getNumeroParcelle();
+			$aExportFields['num_voirie']=$this->getNumeroVoirie();
+			$aExportFields['adresse']=$this->getAdresseParcelle();
+			$aExportFields['code_rivoli']=$this->aFields['ccoriv'];
+			$aExportFields['num_parc_prim']=$this->aFields['dparpi'];
+			$aExportFields['fp_dp']=$this->aFields['gparnf'];
+			
+			if($this->aFields['gurbpa'] == "U" ) {
+				$aExportFields['gurbpa'] = "Oui";
+			}else{
+				$aExportFields['gurbpa'] = "Non";
+			}
+
+			if($this->aFields['gparbat'] == "" || $this->aFields['gparbat'] == "0") {
+				$aExportFields['gparbat'] = "Non";
+			}else{
+				$aExportFields['gparbat'] = "Oui";
+			}
+			$aExportFields['typevoie']=$this->aFields['typevoie'];
+			if ($this->aFields['typevoie'] == "3" ) {
+				$aExportFields['lieudit']=$this->getAdresseParcelle();
+			}else{
+				$aExportFields['lieudit']="";
+			}
+
+			$aExportFields['surface']=$this->aFields['dcntpa'];
+			$aExportFields['dnupro']=$this->aFields['dnupro'];
+			$aExportFields['s_tar']=$this->getSTar();
+			$aExportFields['suf']=$this->getSuf();
+			$aExportFields['grss_gr']=$this->getGrssGr();
+			$aExportFields['clas']=$this->getClas();
+			$aExportFields['nat_cult']=$this->getNatCult();
+			$iContenance = $this->getContenance ();
+			$aExportFields['ha']=intval($iContenance/10000);
+			if ($aExportFields['ha'] == 0) {
+				$aExportFields['ha']= ' ';
+			}
+			$aExportFields['a']=intval(($iContenance%10000)/100);
+			$sContenanceA=$aExportFields['a'];
+			$sContenanceA=strval($sContenanceA);
+			$sTlenA=strlen($sContenanceA);
+			if ($aExportFields['ha'] == ' ' and $aExportFields['a'] == 0){
+				$aExportFields['a']= ' ';
+			}else{
+				if ($aExportFields['ha'] == ' ' and $sTlenA == 2 and (substr($aExportFields['a'],0,1)== 0)) {
+					$sDeuxiemeValeur= substr($aExportFields['a'],1,1);
+					$aExportFields['a']= ' '.$sDeuxiemeValeur;
+				} else {
+					if ($aExportFields['ha'] != ' ' and $sTlenA == 1) {
+						$aExportFields['a']= '0'.$aExportFields['a'];
+					}
+				}
+			}
+			$aExportFields['ca']=$iContenance%100;
+			$sContenanceCa=$aExportFields['ca'];
+			$sContenanceCa= strval($sContenanceCa);
+			$sTlen=strlen($sContenanceCa);
+			if ($aExportFields['a'] != 0)
+				if ($sTlen == 1) {
+					$aExportFields['ca']= '0'.$aExportFields['ca'];
+				}
+			$aExportFields['revenu_cadastral_avec_exo']=$this->getRevenuCadastralAvecExo();
+			$aExportFields['revenu_cadastral_com_avec_exo']=$this->getRevenuCadastralComAvecExo();
+			$aExportFields['revenu_cadastral_dep_avec_exo']=$this->getRevenuCadastralDepAvecExo();
+			$aExportFields['revenu_cadastral_reg_avec_exo']=$this->getRevenuCadastralRegAvecExo();
+			$aExportFields['revenu_cadastral']=$this->getRevenuCadastral();
+			$aExportFields['revenu_cadastral_txt']=$this->setFloatToText($this->getRevenuCadastral());
+			$aExportFields['revenu_reference']=$this->getRevenuReference();
+			$aExportFields['revenu_reference_txt']=$this->setFloatToText($this->getRevenuReference());
+			//$aExportFields['nat_exo']=$this->getNatExo();
+			$aExportFields['contenance']=$iContenance;
+		}
+		return $aExportFields;
+	}
+	/**
+	* Cette méthode permet d'avoir l'attribut dnupla sur 4 caractères.
+	* \return Retourne une chaîne de caractères.
+	*/
+	function getNumeroParcelle(){
+		if(strlen($this->aFields['dnupla']) == 1){
+			return "000".$this->aFields['dnupla'];
+		}
+		if(strlen($this->aFields['dnupla']) == 2){
+			return "00".$this->aFields['dnupla'];
+		}
+		if(strlen($this->aFields['dnupla']) == 3){
+			return "0".$this->aFields['dnupla'];
+		}
+		if(strlen($this->aFields['dnupla']) == 4){
+			return $this->aFields['dnupla'];
+		}
+		
+	}
+	/**
+	* Cette méthode permet de récupérer les deux derniers caractères de l'attribut Jdatat et d'y ajouter 1.
+	* \return Retourne une chaîne de caractères.
+	*/
+	function getJdatat(){
+		$sNewJdatat=$this->aFields['jdatat'];
+		if (preg_match( '`^\d{1,2}/\d{1,2}/\d{4}$`' , $sNewJdatat ) ){
+			$sNewJdatat=substr("$sNewJdatat", 6, 4)+1;
+			$sNewJdatat=(string)(substr("$sNewJdatat", 2, 2));
+		}else if (preg_match( '`^\d{1,2}/\d{1,2}/\d{2}$`' , $sNewJdatat ) ){
+			$sNewJdatat=(string) (substr("$sNewJdatat", 6, 2)+1);
+			if(strlen($sNewJdatat) == 1){
+				$sNewJdatat='0'.$sNewJdatat;
+			}
+			$sNewJdatat=(string) (substr("$sNewJdatat", -2, 2));
+		}else{
+			$sNewJdatat=substr("$sNewJdatat", 4, 4)+1;
+			$sNewJdatat=(string)(substr("$sNewJdatat", 2, 2));
+		}
+		return $sNewJdatat;
+	}
+	/**
+	* Cette méthode permet de concaténer les attributs dnvoiri et indic.
+	* \return Retourne une chaîne de caractères.
+	*/
+	function getNumeroVoirie(){
+		$sNumeroVoirie = ltrim($this->aFields['dnvoiri'],'0').$this->aFields['dindic'];
+		return $sNumeroVoirie;
+	}
+	/**
+	* Cette méthode permet de concaténer les attributs cconvo et dvoilib.
+	* \return Retourne une chaîne de caractères.
+	*/
+	function getAdresseParcelle(){
+		$sAdresseParcelle = rtrim($this->aFields['cconvo'])." ".rtrim($this->aFields['dvoilib']);
+		return $sAdresseParcelle;
+	}
+	/**
+	* Cette méthode permet de récupérer la valeur de l'attribut 's_tar' dans le tableau aSuf.
+	* \return Retourne une chaîne de caractères.
+	*/
+	function getSTar(){
+		if(count($this->aSuf)==1) {
+			return $this->aSuf[0]->aFields['ccostn'];
+		} else {
+			return '';
+		}
+	}
+	/**
+	* Cette méthode permet de récupérer la valeur de l'attribut 'suf' dans le tableau aSuf.
+	* \return Retourne une chaîne de caractères.
+	*/
+	function getSuf(){
+		if(count($this->aSuf)==1) {
+			return $this->aSuf[0]->aFields['ccosub'];
+		}else {
+			return '';
+		}
+	}
+	/**
+	* Cette méthode permet de récupérer la valeur de l'attribut 'grss_gr' dans le tableau aSuf.
+	* \return Retourne une chaîne de caractères.
+	*/
+	function getGrssGr(){
+		if(count($this->aSuf)==1) {
+			return $this->aSuf[0]->aFields['dsgrpf'];
+		}else {
+			return '';
+		}
+	}
+	/**
+	* Cette méthode permet de récupérer la valeur de l'attribut 'clas' dans le tableau aSuf.
+	* \return Retourne une chaîne de caractères.
+	*/
+	function getClas(){
+		if(count($this->aSuf)==1) {
+			return $this->aSuf[0]->aFields['dclssf'];
+		}else {
+			return '';
+		}
+	}
+	/**
+	* Cette méthode permet de récupérer la valeur de l'attribut 'nat_cult' dans le tableau aSuf.
+	* \return Retourne une chaîne de caractères.
+	*/
+	function getNatCult(){
+		if(count($this->aSuf)==1) {
+			return $this->aSuf[0]->aFields['cnatsp'];
+		}else {
+			return '';
+		}
+	}
+	/**
+	* Cette méthode permet de récupérer la valeur de l'attribut 'revenu cadastral' dans le tableau aSuf.
+	* \return Retourne un nombre réel (float).
+	*/
+	function getRevenuCadastral(){
+		$fRevenuCadastral = 0;
+	  	foreach ($this->aSuf as $oSuf) {
+	    	$fRevenuCadastral = $fRevenuCadastral + (float) $oSuf->getRevenuCadastral();
+		} 
+		return $fRevenuCadastral;
+	}
+	/**
+	* Cette méthode permet de récupérer la valeur de l'attribut 'revenu reference' dans le tableau aSuf.
+	* \return Retourne un nombre réel (float).
+	*/
+	function getRevenuReference(){
+		$fRevenuReference = 0;
+		foreach ($this->aSuf as $oSuf) {
+			$fRevenuReference = $fRevenuReference + (float) $oSuf->getRevenuReference();
+		} 
+		return $fRevenuReference;
+	}
+	/**
+	* Cette méthode permet de récupérer la valeur de l'attribut 'revenu cadastral' pour des parcelles avec exonération dans le tableau aSuf.
+	* \return Retourne un nombre réel (float).
+	*/
+	function getRevenuCadastralAvecExo(){
+		$fRevenuCadastralAvecExo = 0;
+		foreach ($this->aSuf as $oSuf) {
+			if(preg_match ("/TA/", $oSuf->getNatExo())){
+				$fRevenuCadastralAvecExo = $fRevenuCadastralAvecExo + (float) $oSuf->getRevenuCadastral();
+			}
+		} 
+		return $fRevenuCadastralAvecExo;
+	}
+
+	/**
+	* Cette méthode permet de récupérer la valeur de l'attribut 'revenu cadastral' pour des parcelles avec exonération dans le tableau aSuf.
+	* lorsque l'exoneration est procuré par une commune, un groupement de commune ou toutes collectivité
+	* \return Retourne un nombre réel (float).
+	*/
+	function getRevenuCadastralComAvecExo(){
+		$fRevenuCadastralComAvecExo = 0;
+		foreach ($this->aSuf as $oSuf) {
+			if(preg_match("/EP/", $oSuf->aFields['gnexps']) or preg_match("/CD/", $oSuf->aFields['gnexps']) or preg_match("/CR/", $oSuf->aFields['gnexps']) or preg_match("/NI/", $oSuf->aFields['gnexps']) or preg_match("/RT/", $oSuf->aFields['gnexps'])){
+				$fRevenuCadastralComAvecExo = $fRevenuCadastralComAvecExo + (float) $oSuf->getRevenuCadastral();
+			} else {
+				if($oSuf->getCcolloc("C") == true) {
+					$fRevenuCadastralComExo = $oSuf->getRevenuCadastralExo("C");
+					$fRevenuCadastralComAvecExo = $fRevenuCadastralComAvecExo + (float) $fRevenuCadastralComExo;
+				} else {
+					if($oSuf->getCcolloc("TC") == true) {
+						$fRevenuCadastralComExo = $oSuf->getRevenuCadastralExo("TC");
+						$fRevenuCadastralComAvecExo = $fRevenuCadastralComAvecExo + (float) $fRevenuCadastralComExo;
+					} else {
+						if($oSuf->getCcolloc("GC") == true) {
+							$fRevenuCadastralComExo = $oSuf->getRevenuCadastralExo("GC");
+					    	$fRevenuCadastralComAvecExo = $fRevenuCadastralComAvecExo + (float) $fRevenuCadastralComExo;
+						}
+					}
+				}
+			}
+		}
+		return $fRevenuCadastralComAvecExo;
+	}
+	
+	function getRevenuCadastralTaxeADAvecExo(){
+		$fRevenuCadastralTaxeADAvecExo = 0;
+		foreach ($this->aSuf as $oSuf) {
+			if(preg_match("/EP/", $oSuf->aFields['gnexps']) or preg_match("/CD/", $oSuf->aFields['gnexps']) or preg_match("/CR/", $oSuf->aFields['gnexps']) or preg_match("/NI/", $oSuf->aFields['gnexps']) or preg_match("/RT/", $oSuf->aFields['gnexps'])){
+				$fRevenuCadastralTaxeADAvecExo = $fRevenuCadastralTaxeADAvecExo + (float) $oSuf->getRevenuCadastral();
+			} else {
+				if($oSuf->getCcolloc("A") == true) {
+					
+					$fRevenuCadastralTaxeADExo = $oSuf->getRevenuCadastralExo("A");
+					
+					$fRevenuCadastralTaxeADAvecExo = $fRevenuCadastralTaxeADAvecExo + (float) $fRevenuCadastralTaxeADExo;
+				}
+			}
+		}
+		return $fRevenuCadastralTaxeADAvecExo;
+	}
+	/**
+	* Cette méthode permet de récupérer la valeur de l'attribut 'revenu cadastral' pour des parcelles avec exonération dans le tableau aSuf.
+	* lorsque l'exoneration est procuré par le département ou toutes collectivité
+	* \return Retourne un nombre réel (float).
+	*/
+	function getRevenuCadastralDepAvecExo(){
+		$fRevenuCadastralDepAvecExo = 0;
+		foreach ($this->aSuf as $oSuf) {
+			if(preg_match("/EP/", $oSuf->aFields['gnexps']) or preg_match("/CD/", $oSuf->aFields['gnexps']) or preg_match("/DR/", $oSuf->aFields['gnexps']) or preg_match("/NI/", $oSuf->aFields['gnexps']) or preg_match("/RT/", $oSuf->aFields['gnexps'])){
+				$fRevenuCadastralDepAvecExo = $fRevenuCadastralDepAvecExo + (float) $oSuf->getRevenuCadastral();
+			} else {
+				if($oSuf->getCcolloc("D") == true) {
+					$fRevenuCadastralDepExo = $oSuf->getRevenuCadastralExo("D");
+					$fRevenuCadastralDepAvecExo = $fRevenuCadastralDepAvecExo + (float) $fRevenuCadastralDepExo;
+				} else {
+					if($oSuf->getCcolloc("TC") == true) {
+						$fRevenuCadastralDepExo = $oSuf->getRevenuCadastralExo("TC");
+						$fRevenuCadastralDepAvecExo = $fRevenuCadastralDepAvecExo + (float) $fRevenuCadastralDepExo;
+					}
+				}
+			}
+		}
+		return $fRevenuCadastralDepAvecExo;
+	}
+	/**
+	* Cette méthode permet de récupérer la valeur de l'attribut 'revenu cadastral' pour des parcelles avec exonération dans le tableau aSuf.
+	* lorsque l'exoneration est procuré par la région ou toutes collectivité
+	* \return Retourne un nombre réel (float).
+	*/
+	function getRevenuCadastralRegAvecExo(){
+		$fRevenuCadastralRegAvecExo = 0;
+		foreach ($this->aSuf as $oSuf) {
+			if(preg_match("/EP/", $oSuf->aFields['gnexps']) or preg_match("/DR/", $oSuf->aFields['gnexps']) or preg_match("/CR/", $oSuf->aFields['gnexps']) or preg_match("/NI/", $oSuf->aFields['gnexps']) or preg_match("/RT/", $oSuf->aFields['gnexps'])){
+				$fRevenuCadastralRegAvecExo = $fRevenuCadastralRegAvecExo + (float) $oSuf->getRevenuCadastral();
+			} else {
+				if($oSuf->getCcolloc("R") == true) {
+					$fRevenuCadastralRegExo = $oSuf->getRevenuCadastralExo("R");
+					$fRevenuCadastralRegAvecExo = $fRevenuCadastralRegAvecExo + (float) $fRevenuCadastralRegExo;
+				} else {
+					if($oSuf->getCcolloc("TC") == true) {
+						$fRevenuCadastralRegExo = $oSuf->getRevenuCadastralExo("TC");
+						$fRevenuCadastralRegAvecExo = $fRevenuCadastralRegAvecExo + (float) $fRevenuCadastralRegExo;
+					}
+				}
+			}
+		}
+		return $fRevenuCadastralRegAvecExo;
+	}
+	/**
+	* Cette méthode permet de récupérer la valeur de l'attribut 'contenance' pour des parcelles avec exonération dans le tableau aSuf.
+	* \return Retourne un entier.
+	*/
+	function getContenance (){
+		$iContenance=0;
+		foreach($this->aSuf as $oSuf){
+			$iContenance=$iContenance+$oSuf->getContenance();
+		}
+		return $iContenance;
+	}
+	
+	/**
+	* Cette méthode permet de récupérer l'ensemble des emprises de la parcelles à partir des properties de la fiche d'urbanisme
+	* \return 
+	*/
+	function getEmprises($aProperties,$oBD,$sLayerTypeParcelle) {
+		// boucler sur toutes les couches à intersecter
+		if(isset($aProperties["cadastre"]["fiche_urb"]["intersect"]["views"])) {
+			foreach($aProperties["cadastre"]["fiche_urb"]["intersect"]["views"] as $sView => $aViewValue) {
+				$oEmprises = new Mj_Emprises($oBD,$this->aFields['id_par'],$sView, $aProperties["cadastre"]["fiche_urb"]["intersect"]["tolerance"], $aViewValue, $sLayerTypeParcelle);				
+				array_push($this->aIntersect,$oEmprises);
+			}
+		}
+		// calcule de l'emprise du bati
+		$sViewBati=$aProperties["cadastre"]["view"]["bati"];
+		if(isset($aProperties["cadastre"]["view"]["bati"])){
+			$aField["type"]="POLYGON";
+			$aField["title"]="Emprise Bati";
+			$oEmprises = new Mj_Emprises($oBD,$this->aFields['id_par'],$sViewBati,$aProperties["cadastre"]["fiche_urb"]["intersect"]["tolerance"], $aField, $sLayerTypeParcelle);
+			array_push($this->aIntersect,$oEmprises);
+		}
+		$this->aObjects=array_merge($this->aObjects,$this->aIntersect);
+	}
+
+	/**
+	* Cette méthode permet de récupérer la valeur de l'attribut 'nat_exo' dans le tableau aSuf.
+	* \return Retourne une chaîne de caractères.
+	*
+	*/
+	/*function getNatExo(){
+		if(count($this->aSuf)==1) {
+			return $this->aSuf[0]->getNatExo();
+		} else{
+			return '';
+		}
+	}*/
+	/**
+	* Cette méthode permet de formater un décimal pour l'affichage.
+	* \return Retourne une chaine
+	*/
+	function setFloatToText($fFloat){
+		return number_format($fFloat,2,'.','');
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/src/module_cadastreV2/web_service/class/majic_libV2/Mj_Pev.class.inc b/src/module_cadastreV2/web_service/class/majic_libV2/Mj_Pev.class.inc
new file mode 100755
index 0000000000000000000000000000000000000000..6e4587fae666df6177b4fbcdf46e17aa9b504f37
--- /dev/null
+++ b/src/module_cadastreV2/web_service/class/majic_libV2/Mj_Pev.class.inc
@@ -0,0 +1,270 @@
+<?php
+/**
+* \file Mj_Pev.class.inc
+* \brief Mj_Pev.class.inc \n \n Ce fichier contient la classe php Mj_Pev
+* 
+* Cette classe permet de s�lectionner les attributs n�cessaires afin de traiter la partie pev. 
+*
+* \author Damien Bedel
+* \author Fabien Marty <fabien.marty@veremes.com>
+* \author Olivier Gayte <olivier.gayte@veremes.com>
+*/
+/**
+* \class Mj_Pev
+* \brief Mj_Pev Class \n \n Mj_Pev est une classe PHP qui h�rite de la classe Mj.
+*
+* Cette classe permet de s�lectionner les attributs n�cessaires afin de traiter la partie pev. 
+*
+* \author Damien Bedel
+* \author Fabien Marty <fabien.marty@veremes.com>
+* \author Olivier Gayte <olivier.gayte@veremes.com>
+*/
+require_once ("Mj.class.inc");
+require_once ("Mj_Exone_Pev.class.inc");
+require_once ("Mj_Habit_Descr.class.inc");
+require_once ("Mj_Depend_Descr.class.inc");
+require_once ("Mj_Prof_Descr.class.inc");
+
+class Mj_Pev extends Mj {
+	/**
+	* Tableau associatif comportant la liste des objets Exone_Pev du b�ti.
+	*/
+	var $aExPev=array();
+	/**
+	* Tableau associatif comportant la liste des objets Descr de(s) habitation(s)
+	*/
+	var $aDescr_Hab=array();
+	/**
+	* Tableau associatif comportant la liste des objets Descr de(s) d�pendance(s)
+	*/
+	var $aDescr_Depend=array();
+	/**
+	* Tableau associatif comportant la liste des objets Descr professionel
+	*/
+	var $aDescr_Prof=array();
+	/**
+	* \param $sIdPev Identifiant de la partie d'Evaluation
+	* \param $oBD Objet de connexion PDO_BD
+	*/
+	function __construct($sIdPev,$oBD){
+		include $this->sRessourcesFile;
+		$this->sSql=$aSql[$oBD->sgbd]['pev'];
+		$this->sSql=str_replace('$sIdPev', $sIdPev, $this->sSql);
+		$oPDOresult=$oBD->execute($this->sSql);
+		if ($oBD->enErreur()) {
+			$this->sStatus=1;
+			$this->sMessage=$oBD->getBDMessage();  	
+		}else{
+			$this->aFields=$oBD->ligneSuivante ($oPDOresult);
+			$this->sStatus=0;
+		}
+		$this->aExPev=$this->get_aEx_Pev($oBD);
+		$this->aDescr_Hab=$this->get_aDescr_Hab($sIdPev,$oBD);
+		$this->aDescr_Depend=$this->get_aDescr_Depend($sIdPev,$oBD);
+		$this->aDescr_Prof=$this->get_aDescr_Prof($sIdPev,$oBD);
+		$this->aObjects=array_merge($this->aExPev,$this->aDescr_Hab,$this->aDescr_Depend,$this->aDescr_Prof);
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer les Id_Ex en fonction d'un Id_Pev donn�
+	* \param $oBD Objet de connexion PDO_BD
+	* \return Retourne un tableau de cha�nes de caract�res.
+	*/
+	function get_aId_Ex_Pev($oBD){
+		if($this->isEmpty()){
+			$aIdExPev="";
+		}else{
+			include $this->sRessourcesFile;
+			$aIdExPev=array();
+			$this->sSql=$aSql[$oBD->sgbd]['get_id_ex_pev'];
+			$this->sSql=str_replace('$sIdPev', $this->aFields['id_pev'], $this->sSql);
+			$oPDOresult=$oBD->execute($this->sSql);
+			if($oBD->enErreur()){
+				$this->sStatus=1;
+				$this->sMessage=$oBD->getBDMessage();
+			}else{
+				while($aResultFetch=$oBD->tableauSuivant ($oPDOresult)){
+					array_push($aIdExPev,$aResultFetch[0]);
+					$this->sStatus=0;
+				}
+			}
+		}
+		return $aIdExPev;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer la liste des objets Exone_Pev du b�ti
+	* \return Retourne un tableau d'objets Exone_Pev
+	*/
+	function get_aEx_Pev($oBD){
+		$aExPev=array();
+		if($this->isEmpty()){
+			$aExPev="";
+		}else{
+			$aIdExPev=$this->get_aId_Ex_Pev($oBD);
+			foreach($aIdExPev as $sValue){
+				array_push($aExPev,new Mj_Exone_Pev($sValue,$oBD));
+			}
+		}
+		return $aExPev;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer les Id_Descr_Hab en fonction d'un Id_Pev donn�
+	* \param $oBD Objet de connexion PDO_BD
+	* \return Retourne un tableau de cha�nes de caract�res.
+	*/
+	function get_aId_Descr_Hab($oBD){
+		if($this->isEmpty()){
+			$aIdDescrHab="";
+		}else{
+			include $this->sRessourcesFile;
+			$aIdDescrHab=array();
+			$this->sSql=$aSql[$oBD->sgbd]['get_id_descr_hab'];
+			$this->sSql=str_replace('$sIdPev',$this->aFields['id_pev'],$this->sSql);
+			$oPDOresult=$oBD->execute($this->sSql);
+			if($oBD->enErreur()){
+				$this->sStatus=1;
+				$this->sMessage=$oBD->getBDMessage();
+			}else{
+				while($aResultFetch=$oBD->ligneSuivante($oPDOresult)){
+					array_push($aIdDescrHab,$aResultFetch);
+					$this->sStatus=0;
+				}
+			}
+		}
+		return $aIdDescrHab;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer la liste des objets Descr du b�ti
+	* \return Retourne un tableau d'objets Descr_Hab
+	*/
+	function get_aDescr_Hab($sIdPev,$oBD){
+		$aDescrHab=array();
+		if($this->isEmpty()){
+			$aDescrHab="";
+		}else{
+			$aIdDescrHab=$this->get_aId_Descr_Hab($oBD);
+			foreach($aIdDescrHab as $aValue){
+				array_push($aDescrHab,new Mj_Habit_Descr($aValue,$oBD));
+			}
+			//array_push($aDescrHab,new Mj_Habit_Descr($sIdPev,$oBD));
+		}
+		return $aDescrHab;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer les Id_Descr_Depend en fonction d'un Id_Pev donn�
+	* \param $oBD Objet de connexion PDO_BD
+	* \return Retourne un tableau de cha�nes de caract�res.
+	*/
+	function get_aId_Descr_Depend($oBD){
+		if($this->isEmpty()){
+			$aIdDescrDepend="";
+		}else{
+			include $this->sRessourcesFile;
+			$aIdDescrDepend=array();
+			$this->sSql=$aSql[$oBD->sgbd]['get_id_descr_depend'];
+			$this->sSql=str_replace('$sIdPev', $this->aFields['id_pev'], $this->sSql);
+			$oPDOresult=$oBD->execute($this->sSql);
+			if($oBD->enErreur()){
+				$this->sStatus=1;
+				$this->sMessage=$oBD->getBDMessage();
+			}else{
+				while($aResultFetch=$oBD->tableauSuivant($oPDOresult)){
+					array_push($aIdDescrDepend,$aResultFetch[0]);
+					$this->sStatus=0;
+				}
+			}
+		}
+		return $aIdDescrDepend;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer la liste des objets Descr_Depend du b�ti
+	* \return Retourne un tableau d'objets Descr_Depend
+	*/
+	function get_aDescr_Depend($sIdPev,$oBD){
+		$aDescrDepend=array();
+		if($this->isEmpty()){
+			$aDescrDepend="";
+		}else{
+			$aIdDescrDepend=$this->get_aId_Descr_Depend($oBD);
+			foreach($aIdDescrDepend as $sValue){
+				array_push($aDescrDepend,new Mj_Depend_Descr($sValue,$oBD));
+			}
+		}
+		return $aDescrDepend;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer la liste des objets Descr_Prof du b�ti
+	* \return Retourne un tableau d'objets Descr_Prof
+	*/
+	function get_aDescr_Prof($sIdPev,$oBD){
+		$aDescr_Prof=array();
+		if($this->isEmpty()){
+			$aDescr_Prof="";
+		}else{
+			array_push($aDescr_Prof,new Mj_Prof_Descr($sIdPev,$oBD));
+		}
+		return $aDescr_Prof;
+	}
+	/**
+	* Cette m�thode permet de construire un tableau correspondant au relev� de propri�t�.
+	* \return Retourne un tableau associatif correspondant au relev� de propri�t�.
+	*/
+	function getExportFields(){
+		$aExportFields=array();
+		if($this->isEmpty()){
+			$aExportFields="";
+		}else{
+			$aExportFields['s_tar']=$this->aFields['ccostb'];
+			$aExportFields['af']=$this->aFields['ccoaff'];
+			$aExportFields['l_nature']=$this->aFields['l_ccoaff'];
+			$aExportFields['cat']=$this->aFields['dcapec'];
+			$aExportFields['nat_exo']=$this->getNatExo();
+			$aExportFields['revenu_cadastral']=$this->getRevenuCadastral();
+			$aExportFields['num_pev']=$this->aFields['dnupev'];
+			$aExportFields['val_loc_ref']=$this->aFields['dvlper'];
+			$aExportFields['val_loc_ann']=$this->aFields['dvlpera'];
+			$aExportFields['nature']=$this->aFields['gnexpl'];
+			$aExportFields['l_nat_exon']=$this->aFields['l_gnexpl'];
+			$aExportFields['local_type']=$this->aFields['dnuref'];
+		}
+		return $aExportFields;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer le revenu cadastral d'une Pev.
+	* \return Retourne un entier.
+	*/
+	function getRevenuCadastral(){
+		if ($this->getNatExo()==''){
+			$iRevenuCadastral=(int)$this->aFields['bipevla1'];
+		}else{
+			$fRevenuCadastral=(float)($this->aFields['dvlpera'])/2;
+			$iRevenuCadastral=round($fRevenuCadastral);
+		}
+		return $iRevenuCadastral;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer le revenu cadastral d'une Pev.
+	* \return Retourne un float.
+	*/
+	function getRevenuCadastralfloat(){
+		if ($this->getNatExo()==''){
+			$fRevenuCadastral=(float)$this->aFields['bipevla1'];
+		}else{
+			$fRevenuCadastral=(float)($this->aFields['dvlpera'])/2;
+		}
+		return $fRevenuCadastral;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer la nature de l'exon�ration qui peut provenir soit de l'attribut 'gnexpl' soit de l'attribut 'gnextl' contenu dans le tableau aExPev.
+	* \return Retourne une cha�ne de caract�res.
+	*/
+	function getNatExo(){
+		if($this->aFields['gnexpl']==''){
+			$sNatExo=$this->aExPev[0]->aFields['gnextl'];
+		}else{
+			$sNatExo=$this->aFields['gnexpl'];
+		}
+		return $sNatExo;
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/src/module_cadastreV2/web_service/class/majic_libV2/Mj_PosPlu.class.inc b/src/module_cadastreV2/web_service/class/majic_libV2/Mj_PosPlu.class.inc
new file mode 100755
index 0000000000000000000000000000000000000000..5a9edf8e2bcfd43db60e5633d7f23e1c08f14132
--- /dev/null
+++ b/src/module_cadastreV2/web_service/class/majic_libV2/Mj_PosPlu.class.inc
@@ -0,0 +1,69 @@
+<?php
+/**
+* \file Mj_Parcelle.class.inc
+* \brief Mj_Parcelle.class.inc \n \n Ce fichier contient la classe php Mj_Parcelle
+* 
+* Cette classe permet de s�lectionner les attributs POS/PLU n�cessaires.
+*
+* \author John Bosch <john.bosch@veremes.com>
+*/
+require_once ("Mj.class.inc");
+require_once ("Mj_Parcelle.class.inc");
+
+class Mj_PosPlu extends Mj {
+
+	/**
+	* Constructeur
+	* \param $oBD Objet de connexion PDO_BD
+	* \param $sIdPar Identifiant de la parcelle
+	* \param $sCodCom Code Insee de la commune
+	*/
+	function __construct($oBD,$sObjectId, $sIdPar,$sCodCom) {
+		include $this->sRessourcesFile;
+		$this->sSql=$aSql[$oBD->sgbd]['pos_plu'];
+		$this->sSql=str_replace('$sObjectId', $sObjectId, $this->sSql);
+		$this->sSql=str_replace('$sIdPar', $sIdPar, $this->sSql);
+		$this->sSql=str_replace('$sCodCom', $sCodCom, $this->sSql);
+		$oPDOresult=$oBD->execute($this->sSql);
+		if ( $oBD->enErreur()) {
+		    $this->sStatus=1;
+		    $this->sMessage=$oBD->getBDMessage();    	
+		}else{
+			while($aRow = $oBD->ligneSuivante ($oPDOresult)) {
+				$this->aFields=$aRow;
+			}
+			
+			$this->sStatus=0;
+		}	
+	
+	}
+	/**
+	* Cette m�thode permet de construire un tableau correspondant au relev� de propri�t�/Fiche Parcelle.
+	* \return Retourne un tableau associatif correspondant au relev� de propri�t�/Fiche Parcelle.
+	*/
+	function getExportFields(){
+		$aExportFields=array();
+		if($this->isEmpty()){
+			$aExportFields="";
+		} 
+		else{
+			$aExportFields['zonage']=$this->aFields['TYPE'];
+			$aExportFields['lib_zonage']=$this->aFields['LIBELLE'];
+			$aExportFields['surface']=$this->getSurface();
+			$aExportFields['cos']=$this->aFields['COS'];
+			$aExportFields['ces']=$this->aFields['CES'];
+			$aExportFields['hauteur']=$this->aFields['HAUTEUR'];
+			$aExportFields['idreg']=$this->aFields['IDREG'];
+			$aExportFields['codecom']=$this->aFields['CODCOM'];
+		}
+		return $aExportFields;
+	}
+	function getSurface(){
+		$iSurface= round($this->aFields['SURFACE']);
+		return $iSurface;
+	}
+	
+
+}
+
+?>
\ No newline at end of file
diff --git a/src/module_cadastreV2/web_service/class/majic_libV2/Mj_Prof_Descr.class.inc b/src/module_cadastreV2/web_service/class/majic_libV2/Mj_Prof_Descr.class.inc
new file mode 100755
index 0000000000000000000000000000000000000000..8c24aed515a0309fb57579b5e44ac57e673fbed5
--- /dev/null
+++ b/src/module_cadastreV2/web_service/class/majic_libV2/Mj_Prof_Descr.class.inc
@@ -0,0 +1,54 @@
+<?php
+/**
+* \file Mj_Prof_Descr.class.inc
+* \brief Mj_Prof_Descr.class.inc \n \n Ce fichier contient la classe php Mj_Prof_Descr
+* 
+* Cette classe permet de s�lectionner les attributs n�cessaires afin de traiter la partie Description Professionel.
+*
+* \author John Bosch
+* \author Olivier Gayte <olivier.gayte@veremes.com>
+*/
+
+require_once ("Mj.class.inc");
+
+class Mj_Prof_Descr extends Mj {
+	/**
+	* \param $sIdPev Identifiant de la partie d'Evaluation
+	* \param $oBD Objet de connexion PDO_BD
+	*/
+	function __construct($sIdPev,$oBD){
+		include $this->sRessourcesFile;
+		$this->sSql=$aSql[$oBD->sgbd]['prof_descr'];
+		$this->sSql=str_replace('$sIdPev', $sIdPev, $this->sSql);
+		$oPDOresult=$oBD->execute($this->sSql);
+		if ( $oBD->enErreur()) {
+		    $this->sStatus=1;
+		    $this->sMessage=$oBD->getBDMessage();    	
+		}
+		else{
+			$this->aFields=$oBD->ligneSuivante ($oPDOresult);
+			$this->sStatus=0;
+		}	
+		
+	}
+	/**
+	* Cette m�thode permet de construire un tableau correspondant au relev� de propri�t�/Fiche Parcelle.
+	* \return Retourne un tableau associatif correspondant au relev� de propri�t�/Fiche Parcelle.
+	*/
+	function getExportFields(){
+		$aExportFields=array();
+		if($this->isEmpty()){
+			$aExportFields="";
+		} 
+		else{
+			$aExportFields['num_invar']=$this->aFields['invar'];
+			$aExportFields['num_pev']=$this->aFields['dnupev'];
+			$aExportFields['num_prof']=$this->aFields['dnudes'];
+			$aExportFields['surface']=$this->aFields['vsurzt'];
+		}
+		return $aExportFields;
+	}
+	
+}
+
+?>
\ No newline at end of file
diff --git a/src/module_cadastreV2/web_service/class/majic_libV2/Mj_Proprietaire.class.inc b/src/module_cadastreV2/web_service/class/majic_libV2/Mj_Proprietaire.class.inc
new file mode 100755
index 0000000000000000000000000000000000000000..31455062cf478a7a56648ece5bc11f3d4635004d
--- /dev/null
+++ b/src/module_cadastreV2/web_service/class/majic_libV2/Mj_Proprietaire.class.inc
@@ -0,0 +1,135 @@
+<?php
+/**
+* \file Mj_Proprietaire.class.inc
+* \brief Mj_Proprietaire.class.inc \n \n Ce fichier contient la classe php Mj_Proprietaire
+* 
+* Cette classe permet de s�lectionner les attributs n�cessaires afin de traiter la partie proprietaire.
+*
+* \author Damien Bedel <damien.bedel@veremes.com>
+* \author Olivier Gayte <olivier.gayte@veremes.com>
+*/
+/**
+* \class Mj_Proprietaire
+* \brief Mj_Proprietaire Class \n \n Mj_Proprietaire est une classe PHP qui h�rite de la classe Mj.
+*
+* Cette classe permet de s�lectionner les attributs n�cessaires afin de traiter la partie proprietaire.
+*
+* \author Damien Bedel <damien.bedel@veremes.com>
+* \author Olivier Gayte <olivier.gayte@veremes.com>
+*/
+require_once ("Mj.class.inc");
+
+class Mj_Proprietaire extends Mj {
+	/**
+	* Tableau associatif comportant la liste des objets Pev du b�ti
+	*/
+	var $aProprietaireNom=array();
+	
+	/**
+	* \param $sIdDnupro Identifiant National de compte communal
+	* \param $sIdPro Identifiant d'un propri�taire pour le d�partement et le CDIF
+	* \param $oBD Objet de connexion PDO_BD
+	*/
+	function __construct($sIdDnupro,$sIdPro,$oBD, $sEncryptedKey=''){
+		$this->sEncryptKey = $sEncryptedKey;
+		include $this->sRessourcesFile;
+		$this->sSql = $aSql[$oBD->sgbd]['proprietaire'];
+		$this->sSql= str_replace('$sIdDnupro', $this->encrypt($sIdDnupro),$this->sSql);
+		$this->sSql = str_replace('$sIdPro', $sIdPro, $this->sSql);
+		$oPDOresult= $oBD->execute($this->sSql);
+		
+		if ( $oBD->enErreur()) {
+		    $this->sStatus=1;
+		    $this->sMessage=$oBD->getBDMessage();    	
+		}else{
+			$this->aFields=$oBD->ligneSuivante ($oPDOresult);
+			$this->aFields['id_dnupro'] = $sIdDnupro;
+			$this->sStatus=0;
+		}
+		$oPDOresult = $oBD->fermeResultat();
+		
+		$this->aProprietaireNom = $this->getProprietaireNom();
+	}
+	/**
+	* Cette m�thode permet de construire un tableau correspondant au relev� de propri�t�.
+	* \return Retourne un tableau associatif correspondant au relev� de propri�t�.
+	*/
+	function getExportFields(){
+		$aExportFields=array();
+		if($this->isEmpty()){
+			$aExportFields="";
+		} 
+		else{
+			$aExportFields['l_ccodro']=$this->aFields['l_ccodro'];
+			$aExportFields['l_ccodem']=$this->aFields['l_ccodem'];
+			$aExportFields['dnuper']=$this->aFields['dnuper'];
+			$aExportFields['dnupro']=$this->aFields['dnupro'];
+			$aExportFields['proprietaire_nom']=$this->getProprietaireNom();
+			$aExportFields['proprietaire_nom_tiers']=$this->getProprietaireNomTiers();
+			$aExportFields['proprietaire_adresse']=$this->getProprietaireAdresse();
+			$aExportFields['jdatnss']=$this->getJdatnss();
+			$aExportFields['dldnss']=$this->getDldnss();
+		}
+		return $aExportFields;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer le nom du propri�taire en fonction de la valeur de l'attribut epxnee.
+	* \return Retourne une cha�ne de caract�res.
+	*/
+	function getProprietaireNom(){
+		switch($this->aFields["epxnee"]){
+			case 'EPX' : 
+				$sProprietaireNom = rtrim($this->aFields["dqualp"])." ".rtrim($this->aFields["ddenom"])." EP ".rtrim($this->aFields["dnomcp"])." ".rtrim($this->aFields["dprncp"]);
+				break;
+			case 'NEE' :
+				$sProprietaireNom = rtrim($this->aFields["dqualp"])." ".rtrim($this->aFields["ddenom"])." EP ".rtrim($this->aFields["dnomlp"])." ".rtrim($this->aFields["dprnlp"]);
+				break;
+			default : 
+				$sProprietaireNom = rtrim($this->aFields["dqualp"])." ".rtrim($this->aFields["ddenom"]);
+				break;
+		}
+		return $sProprietaireNom;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer l'adresse compl�te du propri�taire en concat�nant les attributs dlign3, dlign4, dlign5 et dlign6.
+	* \return Retourne une cha�ne de caract�res.
+	*/
+	function getProprietaireAdresse(){
+		$sProprietaireAdresse = rtrim($this->aFields['dlign3'])." ".ltrim(rtrim($this->aFields['dlign4']),'0')." ".rtrim($this->aFields['dlign5'])." ".rtrim($this->aFields['dlign6']);
+		return $sProprietaireAdresse;
+	}
+	/**
+	* Cette m�thode permet de concat�ner les attributs dnvoiri et indic.
+	* \return Retourne une cha�ne de caract�res. Elle est vide si l'attribut dqualp est vide.
+	*/
+	function getJdatnss(){
+		if($this->aFields["gtoper"]=='2'){
+			$sJdatnss = '';
+		}else{
+			$sJdatnss = "NE(E) le ".$this->aFields['jdatnss'];
+		}
+		return $sJdatnss;
+	}
+	/**
+	* Cette m�thode permet de concat�ner les attributs dnvoiri et indic.
+	* \return Retourne une cha�ne de caract�res. Elle est vide si l'attribut dqualp est vide.
+	*/
+	function getDldnss(){
+		if($this->aFields["gtoper"]=='2'){
+			$sJdatnss = '';
+		}else{
+			$sDldnss = "A ".$this->aFields['dldnss'];
+		}
+		return $sDldnss;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer le nom du propri�taire correspondant � un relev� de propri�t� destin� aux tiers.
+	* \return Retourne une cha�ne de caract�res.
+	*/
+	function getProprietaireNomTiers(){
+		$sProprietaireNomTiers = rtrim($this->aFields["dqualp"])." ".rtrim($this->aFields["ddenom"]);
+		return $sProprietaireNomTiers;
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/src/module_cadastreV2/web_service/class/majic_libV2/Mj_Suf.class.inc b/src/module_cadastreV2/web_service/class/majic_libV2/Mj_Suf.class.inc
new file mode 100755
index 0000000000000000000000000000000000000000..7715c3c59acd8004103af70655270d66c40ce2a9
--- /dev/null
+++ b/src/module_cadastreV2/web_service/class/majic_libV2/Mj_Suf.class.inc
@@ -0,0 +1,332 @@
+<?php
+/**
+* \file Mj_Suf.class.inc
+* \brief Mj_Suf.class.inc \n \n Ce fichier contient la classe php Mj_Suf
+* 
+* Cette classe permet de s�lectionner les attributs n�cessaires afin de traiter la partie Suf. 
+*
+* \author Fabien Marty <fabien.marty@veremes.com>
+* \author Damien Bedel
+* \author Olivier Gayte <olivier.gayte@veremes.com>
+*/
+/**
+* \class Mj_Suf
+* \brief Mj_Suf Class \n \n Mj_Suf est une classe PHP qui h�rite de la classe Mj.
+*
+* Cette classe permet de s�lectionner les attributs n�cessaires afin de traiter la partie Suf. 
+*
+* \author Fabien Marty <fabien.marty@veremes.com>
+* \author Damien Bedel
+* \author Olivier Gayte <olivier.gayte@veremes.com>
+*/
+require_once ("Mj.class.inc");
+require_once ("Mj_Exon_Suf.class.inc");
+
+class Mj_Suf extends Mj {
+	/**
+	* Tableau associatif comportant la liste des objets Exon_Suf d'une parcelle
+	*/
+	var $aExonSuf=array();
+	/**
+	* \param $oBD Objet de connexion PDO_BD
+	* \param $sIdSuf Identifiant de la suf
+	* \param $sIdDnupro Identifiant du propri�taire
+	*/
+	function __construct($oBD,$sIdSuf,$sIdDnupro,$sEncryptedKey='', $bAllSuf=false){
+		$this->bAllSuf = $bAllSuf;
+		$this->sEncryptKey = $sEncryptedKey;
+		include $this->sRessourcesFile;
+		// r�cup�ration du dnupro de la suf
+		$this->sSql=$aSql[$oBD->sgbd]['suf_dnupro'];
+		$this->sSql=str_replace('$sIdSuf', $sIdSuf, $this->sSql);
+		
+		$oPDOresult=$oBD->execute($this->sSql);
+		if ($oBD->enErreur()){
+			$this->sStatus=1;
+			$this->sMessage=$oBD->getBDMessage();
+			$this->sSql=$aSql['suf'];
+		}else{
+			$this->sStatus=0;
+			$aSufPar=$oBD->ligneSuivante ($oPDOresult);
+			// Si le DNUPRO de la suf est diff�rent de la parcelle il s'agit d'une parcelle concern�e par des lots en biens non d�limit�s
+			if (trim($aSufPar['dnupro'])==trim(substr($sIdDnupro,5))){
+				$this->sSql=$aSql[$oBD->sgbd]['suf'];
+			}else{
+				if($this->bAllSuf){
+					$this->sSql=$aSql[$oBD->sgbd]['suf_bnd_all'];
+				}else{
+					$this->sSql=$aSql[$oBD->sgbd]['suf_bnd'];
+				}
+			}
+		}
+		$this->sSql=str_replace('$sIdSuf', $sIdSuf, $this->sSql);
+		$this->sSql=str_replace('sIdDnupro', substr($sIdDnupro, 5), $this->sSql);
+		$oPDOresult=$oBD->execute($this->sSql);
+		if ($oBD->enErreur()){
+			$this->sStatus=1;
+			$this->sMessage=$oBD->getBDMessage();
+		}else{
+			$this->aFields=$oBD->ligneSuivante ($oPDOresult);
+			$this->sStatus=0;
+		}
+		$this->aExonSuf=$this->get_aExon_Suf($oBD);
+		if ($this->aFields['dnulot']){
+			$this->aPro=$this->get_aPro($oBD);
+			$this->aObjects = array_merge ($this->aPro,$this->aExonSuf);
+		}else{
+			$this->aObjects=$this->aExonSuf;
+		}
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer les ID_PRO en fonction d'un ID_DNUPRO donn�.
+	* \return Retourne un tableau de ID_PRO.
+	*/
+	function get_aId_Pro($oBD){
+		if($this->isEmpty()){
+			$aIdPro="";
+		}else{
+			include $this->sRessourcesFile;
+			$aIdPro=array();
+			$this->sSql = $aSql[$oBD->sgbd]['get_id_pro'];
+			$this->sSql = str_replace('$sIdDnupro', $this->encrypt($this->aFields['id_dnupro']), $this->sSql);
+			$oPDOresult= $oBD->execute($this->sSql);
+			if ( $oBD->enErreur()) {
+				$this->sStatus=1;
+				$this->sMessage = $oBD->getBDMessage();
+			}else{
+				while($aResultFetch = $oBD->tableauSuivant ($oPDOresult)){
+					array_push($aIdPro,$aResultFetch[0]);
+					$this->sStatus=0;
+				}
+			}
+		}
+		return $aIdPro;
+		$oPDOresult=$oBD->fermeResultat();
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer la liste des objets Proprietaire
+	* \param $oBD Objet de connexion PDO_BD
+	* \return Retourne un tableau d'objets Proprietaire
+	*/
+	function get_aPro($oBD){
+		$aPro=array();
+		if($this->isEmpty()){
+			$aPro="";
+		}else{
+			$aIdPro = $this->get_aId_Pro($oBD);
+			foreach($aIdPro as $sIdPro){
+				array_push($aPro,new Mj_Proprietaire($this->encrypt($this->aFields['id_dnupro']),$sIdPro,$oBD));
+			}
+		}
+		return $aPro;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer les Rnuexn en fonction d'un Id_Suf donn�
+	* \return Retourne un tableau de cha�ne de caract�res.
+	*/
+	function get_aRnuexn($oBD){
+		if($this->isEmpty()){
+			$aRnuexn="";
+		}else{
+			include $this->sRessourcesFile;
+			$aRnuexn=array();
+			$this->sSql=$aSql[$oBD->sgbd]['get_rnuexn'];
+			$this->sSql=str_replace('$sIdSuf', $this->aFields['id_suf'], $this->sSql);
+			$oPDOresult=$oBD->execute($this->sSql);
+			if ($oBD->enErreur()){
+				$this->sStatus=1;
+				$this->sMessage=$oBD->getBDMessage();
+			}else{
+				while($aResultFetch = $oBD->tableauSuivant ($oPDOresult)){
+					array_push($aRnuexn,$aResultFetch[0]);
+					$this->sStatus=0;
+				}
+			}
+		}
+		return $aRnuexn;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer la liste des objets Exon_Suf d'une parcelle
+	* \return Retourne un tableau d'objets Exon_Suf
+	*/
+	function get_aExon_Suf($oBD){
+		$aExonSuf=array();
+		if($this->isEmpty()){
+			$aExonSuf="";
+		}else{
+			$aRnuexn=$this->get_aRnuexn($oBD);
+			foreach($aRnuexn as $sRnuexn){
+				array_push($aExonSuf,new Mj_Exon_Suf($this->aFields['id_suf'],$sRnuexn,$oBD));
+			}
+		}
+		return $aExonSuf;
+	}
+
+	/**
+	* Cette m�thode permet de construire un tableau correspondant au relev� de propri�t�.
+	* \return Retourne un tableau associatif correspondant au relev� de propri�t�.
+	*/
+	function getExportFields(){
+		$aExportFields=array();
+		if($this->isEmpty()){
+			$aExportFields="";
+		}else{
+			$aExportFields['dnupro']=$this->aFields['dnupro'];
+			$aExportFields['id_dnupro']=$this->aFields['id_dnupro'];
+			$aExportFields['s_tar']=$this->aFields['ccostn'];
+			$aExportFields['suf']=$this->aFields['ccosub'];
+			$aExportFields['gnexps']=$this->aFields['gnexps'];
+			$aExportFields['grss_gr']=$this->aFields['dsgrpf'];
+			$aExportFields['occupation']=$this->aFields['l_dsgrpf'];
+			$aExportFields['nature']=$this->aFields['l_dsgrpf'];
+			$aExportFields['groupe']=$this->aFields['l_cgrnum'];
+			$aExportFields['clas']=$this->aFields['dclssf'];
+			$aExportFields['nat_cult']=$this->aFields['cnatsp'];
+			$aExportFields['ha']=$this->getContenanceHA();
+			if ($aExportFields['ha'] == 0){
+				$aExportFields['ha']=' ';
+			}
+			$aExportFields['a']=$this->getContenanceA();
+			$sContenanceA=$aExportFields['a'];
+			$sContenanceA= strval($sContenanceA);
+			$sTlenA=strlen($sContenanceA);
+			if ($aExportFields['ha'] == ' ' and $aExportFields['a'] == 0){
+				$aExportFields['a']=' ';
+			}else{
+				if ($aExportFields['ha'] == ' ' and $sTlenA == 2 and (substr($aExportFields['a'],0,1)== 0)){
+					$sDeuxiemeValeur= substr($aExportFields['a'],1,1);
+					$aExportFields['a']= ' '.$sDeuxiemeValeur;
+				}else{
+					if ($aExportFields['ha'] != ' ' and $sTlenA == 1){
+						$aExportFields['a']='0'.$aExportFields['a'];
+					}
+				}
+			}
+			$aExportFields['ca']=$this->getContenanceCA();
+			$sContenanceCa=$aExportFields['ca'];
+			$sContenanceCa=strval($sContenanceCa);
+			$sTlen=strlen($sContenanceCa);
+			if ($aExportFields['a'] != 0)
+				if ($sTlen == 1){
+					$aExportFields['ca']='0'.$aExportFields['ca'];
+				}
+			$aExportFields['revenu_cadastral']=$this->getRevenuCadastral();
+			$aExportFields['revenu_cadastral_txt']=$this->setFloatToText($this->getRevenuCadastral());
+			$aExportFields['revenu_cadastral_exo']=$this->getRevenuCadastralExo($sCollectivite);
+			$aExportFields['revenu_reference']=$this->getRevenuReference();
+			$aExportFields['revenu_reference_txt']=$this->setFloatToText($this->getRevenuReference());
+			$aExportFields['nat_exo']=$this->getNatExo();
+			$aExportFields['ccolloc']=$this->getCcolloc($sCollectivite);
+			$aExportFields['contenance_suf']=$this->getContenance();
+			if ($this->aFields['dnulot']){
+				$aExportFields['num_voirie']='*****';
+				$aExportFields['dnulot']=$this->aFields['dnulot'];
+				$aExportFields['dnupdl']=$this->aFields['dnupdl'];
+				$aExportFields['dnumql']=$this->aFields['dnumql'];
+				$aExportFields['ddenql']=$this->aFields['ddenql'];
+			}
+		}
+		return $aExportFields;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer les caract�res correspondants � la colonne HA depuis l'attribut dcntsf.
+	* \return Retourne une cha�ne de caract�res.
+	*/
+	function getContenanceHA(){
+		$sContenanceHA=$this->aFields['dcntsf'];
+		$sContenanceHA=substr("$sContenanceHA",0,5);
+		$iContenanceHA= (int) $sContenanceHA;
+		return $iContenanceHA;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer les caract�res correspondants � la colonne A depuis l'attribut dcntsf.
+	* \return Retourne une cha�ne de caract�res.
+	*/
+	function getContenanceA(){
+		$sContenanceA=$this->aFields['dcntsf'];
+		$sContenanceA=substr("$sContenanceA", 5, 2);
+		return $sContenanceA;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer les caract�res correspondants � la colonne CA depuis l'attribut dcntsf.
+	* \return Retourne une cha�ne de caract�res.
+	*/
+	function getContenanceCA(){
+		$sContenanceCA=$this->aFields['dcntsf'];
+		$sContenanceCA=substr("$sContenanceCA", 7, 2);
+		return $sContenanceCA;
+	}
+	/*
+	* Cette m�thode permet de r�cup�rer la contenance totale d'une suf.
+	* \return Retourne un entier.
+	*/
+	function getContenance(){
+		$iContenanceHA = (int) $this->getContenanceHA();
+		$iContenanceA = (int) $this->getContenanceA();
+		$iContenanceCA = (int) $this->getContenanceCA();
+		$iContenance = ($iContenanceHA*10000)+($iContenanceA*100)+($iContenanceCA);
+		return $iContenance;
+	}
+	/**
+	* Cette m�thode permet de diviser l'attribut drcsuba par 100.
+	* \return Retourne un float.
+	*/
+	function getRevenuCadastral(){
+		$fRevenuCadastral=floatval($this->aFields['drcsuba']);
+		$fRevenuCadastral=$fRevenuCadastral/100;
+		return $fRevenuCadastral;
+	}
+	/**
+	* Cette m�thode permet de diviser l'attribut drcsub par 100.
+	* \return Retourne un float.
+	*/
+	function getRevenuReference(){
+		$fRevenuReference=floatval($this->aFields['drcsub']);
+		$fRevenuReference=$fRevenuReference/100;
+		return $fRevenuReference;
+	}
+
+	/**
+	* Cette m�thode permet de diviser l'attribut rcexnba par 100.
+	* \return Retourne un float.
+	*/
+	function getRevenuCadastralExo($sCollectivite){
+		foreach($this->aExonSuf as $aFieldsRevExo) {
+			if (rtrim($aFieldsRevExo->aFields['ccolloc']) == $sCollectivite) {
+				$fRevenuCadastral=floatval($aFieldsRevExo->aFields['rcexnba']);
+				$fRevenuCadastral=$fRevenuCadastral/100;
+			}
+		}
+		return $fRevenuCadastral;
+	}
+	/**
+	* Cette m�thode permet de r�cup�rer la valeur de l'attribut 'nat_exo' du tableau aExonSuf.
+	* \return Retourne une cha�ne de caract�res.
+	*/
+	function getNatExo(){
+		return $this->aExonSuf[0]->aFields['gnexts'];
+	}
+	/** 
+	* Cette m�thode permet de r�cup�rer la valeur de l'attribut 'ccolloc' du tableau aExonSuf.
+	* \return Retourne une cha�ne de caract�res.
+	*/
+	function getCcolloc($sCollectivite){
+		$bVal=false;
+		foreach($this->aExonSuf as $aFieldsExo) {
+			if(rtrim($aFieldsExo->aFields['ccolloc']) == $sCollectivite) {
+				$aReturn=$aFieldsExo;
+				$bVal=true;
+			}
+		}
+		return $bVal;
+	}
+	/**
+	* Cette m�thode permet de formater un d�cimal pour l'affichage.
+	* \return Retourne une chaine
+	*/
+	function setFloatToText($fFloat){
+		return number_format($fFloat,2,'.','');
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/src/module_cadastreV2/web_service/class/majic_libV2/xsl/FP.xslt b/src/module_cadastreV2/web_service/class/majic_libV2/xsl/FP.xslt
new file mode 100755
index 0000000000000000000000000000000000000000..64881b2790eef9e028ee40ed5f818ad271fb38d8
--- /dev/null
+++ b/src/module_cadastreV2/web_service/class/majic_libV2/xsl/FP.xslt
@@ -0,0 +1,1481 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE xsl:stylesheet [
+  <!ENTITY nbsp "&#160;">
+]>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  <xsl:output method="html" encoding="utf-8" doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
+  <xsl:template match="/">
+    <xsl:param name="poste"/>
+    <xsl:param name="type"/>
+
+    <html xmlns="http://www.w3.org/1999/xhtml"
+      lang="fr"
+      >
+      <head>
+        <style type="text/css">
+          body {
+          font-family:arial, "sans-serif";
+          padding:100px 20px 20px 20px;
+          background-image:url(http://img15.hostingpics.net/pics/500812bandeau.jpg);
+          background-repeat:no-repeat;
+          background-position:center top;
+          }
+
+          hr {
+          text-align: center;
+          width:100%;
+          color:#F1B4B4;
+          }
+
+          table {
+          text-align:left;
+          width:100%;
+          font-size:12px;
+          margin-bottom:35px;
+          }
+
+          td {
+          text-align:left;
+
+          background-color:#F7F7F7 ;
+          }
+
+          h1 {
+          font-family:tahoma;
+          color: #008393;
+          }
+
+          th {
+          text-align:left;
+
+          background-color:#eeeeee;
+          }
+
+          h4 {
+          font-family:tahoma;
+          color: #990000;
+          }
+
+          h5 {
+          font-family:tahoma;
+          }
+        </style>
+      </head>
+      <body>
+        <hr size="5"/>
+        <h1>
+          <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle">
+            Parcelle <xsl:value-of select="@section" /><xsl:value-of select="format-number(@num_parc, '0000')"/>
+          </xsl:for-each>
+        </h1>
+        <hr size="10"/>
+        <Table cellspacing="2" cellpadding="5" >
+          <TR>
+            <TH align="left" width ="15%">
+              Adresse :
+            </TH>
+            <TD align="left" width ="85%">
+              <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle">
+                <xsl:value-of select="@num_voirie" />
+                <xsl:text disable-output-escaping="yes">&amp;nbsp;</xsl:text>
+                <xsl:value-of select="@adresse" />
+              </xsl:for-each>
+            </TD>
+          </TR>
+          <TR>
+            <TH align="left" width ="15%">
+              Commune :
+            </TH>
+            <TD align="left" width ="85%">
+              <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle">
+                <xsl:value-of select="@libcom" />
+              </xsl:for-each>
+            </TD>
+          </TR>
+          <TR>
+            <TH align="left" width ="15%">
+              Code Commune (Insee) :
+            </TH>
+            <TD align="left" width ="85%">
+              <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle">
+                <xsl:value-of select="@codeinsee" />
+              </xsl:for-each>
+            </TD>
+          </TR>
+          <TR>
+            <TH align="left" width ="15%">
+              Compte Propriétaire :
+            </TH>
+            <TD align="left" width ="85%">
+              <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle">
+                <xsl:value-of select="Mj_Parcelle/@dnupro" />
+                <BR/>
+              </xsl:for-each>
+            </TD>
+          </TR>
+          <TR>
+            <TH align="left" width ="15%">
+              Surface cadastrale (m²) :
+            </TH>
+            <TD align="left" width ="85%">
+              <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle">
+                <xsl:value-of select="@total_contenance_m2" />
+              </xsl:for-each>
+            </TD>
+          </TR>
+          <xsl:if test="not($type='restreint')">
+            <TR>
+              <TH align="left" width ="15%">
+                Urbaine :
+              </TH>
+              <TD align="left" width ="85%">
+                <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle">
+                  <xsl:value-of select="@gurbpa" />
+                </xsl:for-each>
+              </TD>
+            </TR>
+            <TR>
+              <TH align="left" width ="15%">
+                Bâtie :
+              </TH>
+              <TD align="left" width ="85%">
+                <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle">
+                  <xsl:value-of select="@gparbat" />
+                </xsl:for-each>
+              </TD>
+            </TR>
+            <TR>
+              <TH align="left" width ="15%">
+                Parcelle primitive :
+              </TH>
+              <TD align="left" width ="85%">
+                <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle">
+                  <xsl:if test="not(@num_parc_prim = '')">
+                    <xsl:value-of select="@num_parc_prim" />
+                  </xsl:if>
+                  <xsl:if test="@num_parc_prim = ''">
+                    -
+                  </xsl:if>
+                </xsl:for-each>
+              </TD>
+            </TR>
+          </xsl:if>
+        </Table>
+        <xsl:if test="$poste='internet'">
+          <img>
+            <xsl:attribute name="src">http://mapsrv.rgd74.fr/geomap70/mg/net/ggGetMapImage.aspx?USER=Administrator&amp;PWD=admin&amp;MAPNAME=Library://RISNET_GESTION/Cartes/RGD 73-74 - RISNET_GESTION_73_74.MapDefinition&amp;SELOBJS=PARCELLE%2C<xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle">
+                <xsl:value-of select='substring(@idpar,1,2)'/>
+                <xsl:value-of select='substring(@idpar,4,3)'/>
+                <xsl:if test ="substring(@idpar,7,3)='000'">
+                  <xsl:text disable-output-escaping="yes">---</xsl:text>
+                </xsl:if>
+                <xsl:if test ="not(substring(@idpar,7,3)='000')">
+                  <xsl:value-of select='substring(@idpar,7,3)'/>
+                </xsl:if>
+                <xsl:if test ="substring(@idpar,10,1)='0'">
+                  <xsl:text disable-output-escaping="yes">-</xsl:text>
+                </xsl:if>
+                <xsl:if test ="not(substring(@idpar,10,1)='0')">
+                  <xsl:value-of select='substring(@idpar,10,1)'/>
+                </xsl:if>
+                <xsl:value-of select='substring(@idpar,11,1)'/>
+                <xsl:value-of select='substring(@idpar,12)'/>
+              </xsl:for-each>-&amp;CENTERX=&amp;CENTERY=&amp;SCALE=*8&amp;HEIGHT=400&amp;WIDTH=575&amp;RESULTTYPE=JPG</xsl:attribute>
+          </img>
+          <h4>
+            Urbanisme : POS/PLU
+          </h4>
+          <Table cellspacing="2" cellpadding="5">
+            <TR>
+              <TH>
+                Zonage
+              </TH>
+              <TH>
+                Libellé
+              </TH>
+              <TH>
+                Surface (m²)*
+              </TH>
+              <TH>
+                COS
+              </TH>
+              <TH>
+                CES
+              </TH>
+              <TH>
+                Hauteur
+              </TH>
+              <TH>
+                Réglement de la zone
+              </TH>
+            </TR>
+            <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle/Mj_PosPlu">
+              <TR>
+                <TD>
+                  <xsl:value-of select="@zonage" />&nbsp;
+                </TD>
+                <TD>
+                  <xsl:value-of select="@lib_zonage" />&nbsp;
+                </TD>
+                <TD>
+                  <xsl:value-of select="@surface" />&nbsp;
+                </TD>
+                <TD>
+                  <xsl:value-of select="@cos" />&nbsp;
+                </TD>
+                <TD>
+                  <xsl:value-of select="@ces" />&nbsp;
+                </TD>
+                <TD>
+                  <xsl:value-of select="@hauteur" /> &nbsp;
+                </TD>
+                <TD>
+                  <a>
+                    <xsl:attribute name="href">http://mapris.rgd74.fr/DocumentsPartenaires/Reglement_POS/<xsl:value-of select="@idreg" />.pdf</xsl:attribute>Consulter le réglement
+                  </a> &nbsp;
+                </TD>
+              </TR>
+            </xsl:for-each>
+          </Table>
+          <h6>*calcul sur la surface graphique, exclusion si surface &#139; 2 m² </h6>
+          <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle/Mj_PosPlu">
+            <a>
+              <xsl:attribute name="href">http://mapris.rgd74.fr/Risnet_Gestion/Application/Rapport/etat_pos_plu/fiche_pos.asp?codcom=<xsl:value-of select="@codecom" /></xsl:attribute>Avancement de l'actualisation/mise en ligne du POS/PLU de cette commune
+            </a> &nbsp;
+          </xsl:for-each>
+        </xsl:if>
+        <xsl:if test="not($type='sansnom')">
+          <hr size="5"/>
+          <h4>
+            Propriétaire(s) de la parcelle
+          </h4>
+          <h6>*Cliquer sur le n° de compte pour accéder à son relevé de propriété </h6>
+          <Table cellspacing="2" cellpadding="5">
+            <TR>
+              <TH colspan="2">
+                Compte
+              </TH>
+              <TH>
+                Nom
+              </TH>
+              <xsl:if test="$type='complet'">
+                <TH>
+                  Etat Civil
+                </TH>
+              </xsl:if>
+              <TH>
+                Adresse
+              </TH>
+              <TH>
+                Type
+              </TH>
+            </TR>
+            <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Proprietaire">
+              <TR>
+                <TD colspan="2">
+                  <xsl:if test="$type='complet'">
+                    <a>
+                      <xsl:attribute name="href">http://ns227471.ovh.net/rgd/rgdservices.phtml?operation=GetReleveprop&amp;compte=<xsl:value-of select="@dnupro"/>&amp;type=complet&amp;format=pdf&amp;version=1.0</xsl:attribute><xsl:value-of select="@dnupro" />
+                    </a>
+                  </xsl:if>
+                  <xsl:if test="$type='restreint'">
+                    <a>
+                      <xsl:attribute name="href">http://ns227471.ovh.net/rgd/rgdservices.phtml?operation=GetReleveprop&amp;compte=<xsl:value-of select="@dnupro"/>&amp;type=restreint&amp;format=pdf&amp;version=1.0</xsl:attribute><xsl:value-of select="@dnupro" />
+                    </a>
+                  </xsl:if>
+                  <xsl:if test="$type='sansnom'">
+                    <xsl:value-of select="@dnupro" />&nbsp;
+                  </xsl:if>
+                </TD>
+                <TD>
+                  <xsl:if test="$type='complet'">
+                    <xsl:value-of select="@proprietaire_nom" />&nbsp;
+                  </xsl:if>
+                  <xsl:if test="$type='restreint'">
+                    <xsl:value-of select="@proprietaire_nom_tiers" />&nbsp;
+                  </xsl:if>
+                </TD>
+                <xsl:if test="$type='complet'">
+                  <TD>
+                    <xsl:value-of select="@jdatnss" />
+                    <BR/>
+                    <xsl:value-of select="@dldnss" />&nbsp;
+                  </TD>
+                </xsl:if>
+                <TD>
+                  <xsl:value-of select="@proprietaire_adresse" />&nbsp;
+                </TD>
+                <TD>
+                  <xsl:value-of select="@l_ccodro" /> &nbsp;
+                </TD>
+              </TR>
+              <xsl:if test ="..//Mj_Parcelle/Mj_Suf/Mj_Proprietaire[@dnupro]">
+                <tr>
+                  <th colspan="6">
+                    Détail
+                  </th>
+                </tr>
+                <TR>
+                  <TH>
+                    Numéro du lot
+                  </TH>
+                  <TH>
+                    Compte
+                  </TH>
+                  <TH>
+                    Nom
+                  </TH>
+                  <xsl:if test="$type='complet'">
+                    <TH>
+                      Etat Civil
+                    </TH>
+                  </xsl:if>
+                  <TH>
+                    Adresse
+                  </TH>
+                  <TH>
+                    Type
+                  </TH>
+                </TR>
+                <xsl:for-each select="../Mj_Parcelle/Mj_Suf/Mj_Proprietaire">
+                  <tr>
+                    <td>
+                      <xsl:value-of select="../@dnulot" /> &nbsp;
+                    </td>
+                    <td>
+                      <xsl:if test="$type='complet'">
+                        <a>
+                          <xsl:attribute name="href">http://ns227471.ovh.net/rgd/rgdservices.phtml?operation=GetReleveprop&amp;compte=<xsl:value-of select="@dnupro"/>&amp;type=complet&amp;format=pdf&amp;version=1.0</xsl:attribute><xsl:value-of select="@dnupro" />
+                        </a>
+                      </xsl:if>
+                      <xsl:if test="$type='restreint'">
+                        <a>
+                          <xsl:attribute name="href">http://ns227471.ovh.net/rgd/rgdservices.phtml?operation=GetReleveprop&amp;compte=<xsl:value-of select="@dnupro"/>&amp;type=restreint&amp;format=pdf&amp;version=1.0</xsl:attribute><xsl:value-of select="@dnupro" />
+                        </a>
+                      </xsl:if>
+                      <xsl:if test="$type='sansnom'">
+                        <xsl:value-of select="@dnupro" />&nbsp;
+                      </xsl:if>
+                    </td>
+                    <td>
+                      <xsl:if test="$type='complet'">
+                        <xsl:value-of select="@proprietaire_nom" />&nbsp;
+                      </xsl:if>
+                      <xsl:if test="$type='restreint'">
+                        <xsl:value-of select="@proprietaire_nom_tiers" />&nbsp;
+                      </xsl:if>
+                    </td>
+                    <xsl:if test="$type='complet'">
+                    <td>
+                        <xsl:value-of select="@jdatnss" />
+                        <BR/>
+                        <xsl:value-of select="@dldnss" />&nbsp;   
+                    </td>
+                    </xsl:if>
+                    <td>
+                      <xsl:value-of select="@proprietaire_adresse" />&nbsp;
+                    </td>
+                    <td>
+                      <xsl:value-of select="@l_ccodro" /> &nbsp;
+                    </td>
+                  </tr>
+                </xsl:for-each>
+              </xsl:if>
+            </xsl:for-each>
+          </Table>
+        </xsl:if>
+        <hr size="5"/>
+        <h4>
+          Subdivision(s) fiscale(s)
+        </h4>
+        <Table cellspacing="2" cellpadding="5">
+          <TR>
+            <TH>
+              Lettre
+            </TH>
+            <TH>
+              Groupe
+            </TH>
+            <TH>
+              Nature
+            </TH>
+            <TH>
+              Classe
+            </TH>
+            <TH>
+              Compte
+            </TH>
+            <TH>
+              Surface (m²)
+            </TH>
+            <xsl:if test="not($type='restreint')">
+              <TH>
+                Revenu (€)
+              </TH>
+            </xsl:if>
+            <TH>
+              Référence
+            </TH>
+          </TR>
+          <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle/Mj_Suf">
+            <TR>
+              <TD>
+                <xsl:if test="not(@suf = '')">
+                  <xsl:value-of select="@suf" />&nbsp;
+                </xsl:if>
+                <xsl:if test="@suf = ''">
+                  -
+                </xsl:if>
+              </TD>
+              <TD>
+                <xsl:if test="not(@groupe = '')">
+                  <xsl:value-of select="@groupe" />&nbsp;
+                </xsl:if>
+                <xsl:if test="@groupe = ''">
+                  -
+                </xsl:if>
+              </TD>
+              <TD>
+                <xsl:if test="not(@nature = '')">
+                  <xsl:value-of select="@nature" />&nbsp;
+                </xsl:if>
+                <xsl:if test="@nature = ''">
+                  -
+                </xsl:if>
+              </TD>
+              <TD>
+                <xsl:if test="not(@clas = '')">
+                  <xsl:value-of select="@clas" />&nbsp;
+                </xsl:if>
+                <xsl:if test="@clas = ''">
+                  -
+                </xsl:if>
+              </TD>
+              <TD>
+                <xsl:value-of select="@dnupro" />&nbsp;
+              </TD>
+              <TD>
+                <xsl:value-of select="@contenance_suf" />&nbsp;
+              </TD>
+              <xsl:if test="not($type='restreint')">
+                <TD>
+                  <xsl:value-of select="@revenu_cadastral_txt" />&nbsp;
+                </TD>
+              </xsl:if>
+              <TD>
+                <xsl:value-of select="@revenu_reference_txt" />&nbsp;
+              </TD>
+            </TR>
+          </xsl:for-each>
+        </Table>
+        <xsl:if test="not($type='sansnom')">
+          <xsl:if test="count(Mj/Mj_Compte_Communal_Parcelle/Mj_Bati) &gt; 0">
+            <hr size="5"/>
+            <h4>
+              Elément(s) bâti(s)
+            </h4>
+            <xsl:if test="$type='complet'">
+              <h6>*Cliquer sur la référence du local pour accéder à sa description</h6>
+            </xsl:if>
+            <Table cellspacing="2" cellpadding="5">
+              <TR>
+                <TH>
+                  Ref. local
+                </TH>
+                <TH>
+                  Nature
+                </TH>
+                <TH>
+                  <xsl:if test="$type='restreint'">
+                    Etages
+                  </xsl:if>
+                  <xsl:if test="$type='complet'">
+                    Date mutation
+                  </xsl:if>
+                </TH>
+                <TH>
+                  Propriétaire(s)
+                </TH>
+              </TR>
+              <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Bati">
+                <xsl:for-each select="Mj_Proprietaire">
+                  <TR>
+                    <xsl:if test="position()='1'">
+                      <TD>
+                        <xsl:if test="$type='restreint'">
+                          <xsl:value-of select="../@num_invar" />
+                        </xsl:if>
+                        <xsl:if test="$type='complet'">
+                          <a href="#{../@num_invar}">
+                            <xsl:value-of select="../@num_invar" />
+                          </a>&nbsp;
+                        </xsl:if>
+                      </TD>
+                      <TD>
+                        <xsl:value-of select="../@lib_nature" />&nbsp;
+                      </TD>
+                      <TD>
+                        <xsl:if test="$type='restreint'">
+                          <xsl:value-of select="../@niv" />&nbsp;
+                        </xsl:if>
+                        <xsl:if test="$type='complet'">
+                          <xsl:value-of select="../@date_mut" />&nbsp;
+                        </xsl:if>
+                      </TD>
+                    </xsl:if>
+                    <xsl:if test="position() &gt; '1'">
+                      <TD>
+                      </TD>
+                      <TD>
+                      </TD>
+                      <TD>
+                      </TD>
+                    </xsl:if>
+                    <TD>
+                      <xsl:if test="$type='restreint'">
+                        <xsl:value-of select="@dnupro" />&nbsp;
+                      </xsl:if>
+                      <xsl:if test="$type='complet'">
+                        <xsl:value-of select="@proprietaire_nom" />&nbsp;
+                      </xsl:if>
+                    </TD>
+                  </TR>
+                </xsl:for-each>
+              </xsl:for-each>
+            </Table>
+          </xsl:if>
+          <!-- .........................................Propriétaire de Bâtis, mode restreint................................................. -->
+          <xsl:if test="$type='restreint'">
+            <hr size="5"/>
+            <h4>
+              Propriétaire(s) du local
+            </h4>
+
+            <Table cellspacing="2" cellpadding="5">
+              <TR>
+                <TH>
+                  Compte
+                </TH>
+                <TH>
+                  Nom
+                </TH>
+                <TH>
+                  Adresse
+                </TH>
+                <TH>
+                  Type
+                </TH>
+              </TR>
+              <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Bati/Mj_Proprietaire">
+                <TR>
+                  <TD>
+                    <a>
+                      <xsl:attribute name="href">http://ns227471.ovh.net/rgd/rgdservices.phtml?operation=GetReleveprop&amp;compte=<xsl:value-of select="@dnupro"/>&amp;type=restreint&amp;format=pdf&amp;version=1.0</xsl:attribute><xsl:value-of select="@dnupro" />
+                    </a>
+                  </TD>
+                  <TD>
+                    <xsl:value-of select="@proprietaire_nom" />&nbsp;
+                  </TD>
+                  <TD>
+                    <xsl:value-of select="@proprietaire_adresse" />&nbsp;
+                  </TD>
+                  <TD>
+                    <xsl:value-of select="@l_ccodro" />&nbsp;
+                  </TD>
+                </TR>
+              </xsl:for-each>
+            </Table>
+
+          </xsl:if>
+          <!-- .........................................Description du local, mode complet................................................. -->
+          <xsl:if test="$type='complet'">
+            <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Bati">
+              <hr size="15"/>
+              <h1>
+
+                <a name="{@num_invar}">
+                  Local n° <xsl:value-of select="@num_invar" />
+                </a>
+
+              </h1>
+              <hr size="10"/>
+              <Table cellspacing="2" cellpadding="5">
+                <TR>
+                  <TH align="left" width="39%">
+
+                  </TH>
+                  <TH align="left" width="40%">
+
+                  </TH>
+                  <TH align="center" width="7%">
+                    Bat
+                  </TH>
+                  <TH align="center" width="7%">
+                    Esc
+                  </TH>
+                  <TH align="center" width="7%">
+                    Etage
+                  </TH>
+                </TR>
+
+                <TR>
+                  <TH align="left" width="39%">
+                    Adresse :
+                  </TH>
+                  <TD align="left" width="40%">
+                    <xsl:value-of select="@voirie" />&nbsp;<xsl:value-of select="@adresse" />&nbsp;
+                  </TD>
+                  <TD align="center" width="7%">
+                    <xsl:value-of select="@bat" />&nbsp;
+                  </TD>
+                  <TD align="center" width="7%">
+                    <xsl:value-of select="@ent" />&nbsp;
+                  </TD>
+                  <TD align="center" width="7%">
+                    <xsl:value-of select="@niv" />&nbsp;
+                  </TD>
+                </TR>
+                <TR>
+                  <TH align="left" width="39%">
+                    Commune :
+                  </TH>
+                  <TD align="left" width="40%">
+                    <xsl:value-of select="@libcom" />&nbsp;
+                  </TD>
+                  <TD align="center" width="7%">
+
+                  </TD>
+                  <TD align="center" width="7%">
+
+                  </TD>
+                  <TD align="center" width="7%">
+
+                  </TD>
+                </TR>
+                <TR>
+                  <TH align="left" width="39%">
+                    Type :
+                  </TH>
+                  <TD align="left" width="40%">
+                    <xsl:value-of select="@dteloc" />&nbsp;
+                  </TD>
+                  <TD align="center" width="7%">
+
+                  </TD>
+                  <TD align="center" width="7%">
+
+                  </TD>
+                  <TD align="center" width="7%">
+
+                  </TD>
+                </TR>
+                <TR>
+                  <TH align="left" width="39%">
+                    Occupation :
+                  </TH>
+                  <TD align="left" width="40%">
+                    <xsl:value-of select="@lib_occupation" />&nbsp;
+                  </TD>
+                  <TD align="center" width="7%">
+
+                  </TD>
+                  <TD align="center" width="7%">
+
+                  </TD>
+                  <TD align="center" width="7%">
+
+                  </TD>
+                </TR>
+                <TR>
+                  <TH align="left" width="39%">
+                    Nature :
+                  </TH>
+                  <TD align="left" width="40%">
+                    <xsl:value-of select="@lib_nature" />&nbsp;
+                  </TD>
+                  <TD align="center" width="7%">
+
+                  </TD>
+                  <TD align="center" width="7%">
+
+                  </TD>
+                  <TD align="center" width="7%">
+
+                  </TD>
+                </TR>
+                <TR>
+                  <TH align="left" width="39%">
+                    Année de construction :
+                  </TH>
+                  <TD align="left" width="40%">
+                    <xsl:if test="not(@annee_constr = '0')">
+                      <xsl:value-of select="@annee_constr" />&nbsp;
+                    </xsl:if>
+                    <xsl:if test="@annee_constr = '0'">
+                      -
+                    </xsl:if>
+                  </TD>
+                  <TD align="center" width="7%">
+
+                  </TD>
+                  <TD align="center" width="7%">
+
+                  </TD>
+                  <TD align="center" width="7%">
+
+                  </TD>
+                </TR>
+                <TR>
+                  <TH align="left" width="39%">
+                    Date de mutation :
+                  </TH>
+                  <TD align="left" width="40%">
+                    <xsl:value-of select="@date_mut" />&nbsp;
+                  </TD>
+                  <TD align="center" width="7%">
+
+                  </TD>
+                  <TD align="center" width="7%">
+
+                  </TD>
+                  <TD align="center" width="7%">
+
+                  </TD>
+                </TR>
+                <TR>
+                  <TH align="left" width="39%">
+                    Valeur cadastrale (€) :
+                  </TH>
+                  <TD align="left" width="40%">
+                    <xsl:value-of select="Mj_Pev/@revenu_cadastral" />&nbsp;
+                  </TD>
+                  <TD align="center" width="7%">
+
+                  </TD>
+                  <TD align="center" width="7%">
+
+                  </TD>
+                  <TD align="center" width="7%">
+
+                  </TD>
+                </TR>
+                <TR>
+                  <TH align="left" width="39%">
+                    Niveaux :
+                  </TH>
+                  <TD align="left" width="40%">
+                    <xsl:value-of select="@niveaux" />&nbsp;
+                  </TD>
+                  <TD align="center" width="7%">
+
+                  </TD>
+                  <TD align="center" width="7%">
+
+                  </TD>
+                  <TD align="center" width="7%">
+
+                  </TD>
+                </TR>
+
+              </Table>
+              <hr size="5"/>
+              <h4>
+                Propriétaire(s) du local
+              </h4>
+              <Table cellspacing="2" cellpadding="5">
+                <TR>
+                  <TH>
+                    Compte
+                  </TH>
+                  <TH>
+                    Nom
+                  </TH>
+                  <TH>
+                    État Civil
+                  </TH>
+                  <TH>
+                    Adresse
+                  </TH>
+                  <TH>
+                    Type
+                  </TH>
+                </TR>
+
+                <xsl:for-each select="Mj_Proprietaire">
+                  <TR>
+                    <TD>
+                      <a>
+                        <xsl:attribute name="href">http://ns227471.ovh.net/rgd/rgdservices.phtml?operation=GetReleveprop&amp;compte=<xsl:value-of select="@dnupro"/>&amp;type=complet&amp;format=pdf&amp;version=1.0</xsl:attribute><xsl:value-of select="@dnupro" />
+                      </a>
+                    </TD>
+                    <TD>
+                      <xsl:value-of select="@proprietaire_nom" />&nbsp;
+                    </TD>
+                    <TD>
+                      <xsl:value-of select="@jdatnss" />
+                      <BR/>
+                      <xsl:value-of select="@dldnss" />&nbsp;
+                    </TD>
+                    <TD>
+                      <xsl:value-of select="@proprietaire_adresse" />&nbsp;
+                    </TD>
+                    <TD>
+                      <xsl:value-of select="@l_ccodro" />&nbsp;
+                    </TD>
+                  </TR>
+                </xsl:for-each>
+
+              </Table>
+              <hr size="5"/>
+              <h4>
+                P.E.V
+              </h4>
+              <Table cellspacing="2" cellpadding="5">
+                <TR>
+                  <TH>
+                    N°
+                  </TH>
+                  <TH>
+                    Nature
+                  </TH>
+                  <TH>
+                    Catégorie fiscale
+                  </TH>
+                  <TH>
+                    Série Tarif batie
+                  </TH>
+                  <TH>
+                    Local Type
+                  </TH>
+                  <TH>
+                    Val. Loc. Ref. (€)
+                  </TH>
+                  <TH>
+                    Val. Loc. Ann. (€)
+                  </TH>
+                  <TH>
+                    Nature exonération
+                  </TH>
+                </TR>
+
+                <xsl:for-each select="Mj_Pev">
+                  <TR>
+                    <TD>
+                      <xsl:if test="not(@num_pev = '')">
+                        <xsl:value-of select="@num_pev" />&nbsp;
+                      </xsl:if>
+                      <xsl:if test="@num_pev = ''">
+                        -
+                      </xsl:if>
+                    </TD>
+                    <TD>
+                      <xsl:if test="not(@l_nature = '')">
+                        <xsl:value-of select="@l_nature" />&nbsp;
+                      </xsl:if>
+                      <xsl:if test="@l_nature = ''">
+                        -
+                      </xsl:if>
+                    </TD>
+                    <TD>
+                      <xsl:if test="not(@cat = '')">
+                        <xsl:value-of select="@cat" />&nbsp;
+                      </xsl:if>
+                      <xsl:if test="@cat = ''">
+                        -
+                      </xsl:if>
+                    </TD>
+                    <TD>
+                      <xsl:if test="not(@s_tar = '')">
+                        <xsl:value-of select="@s_tar" />&nbsp;
+                      </xsl:if>
+                      <xsl:if test="@s_tar = ''">
+                        -
+                      </xsl:if>
+                    </TD>
+                    <TD>
+                      <xsl:if test="not(@local_type = '')">
+                        <xsl:value-of select="@local_type" />&nbsp;
+                      </xsl:if>
+                      <xsl:if test="@local_type = ''">
+                        -
+                      </xsl:if>
+                    </TD>
+                    <TD>
+                      <xsl:if test="not(@val_loc_ref = '')">
+                        <xsl:value-of select="@val_loc_ref" />&nbsp;
+                      </xsl:if>
+                      <xsl:if test="@val_loc_ref = ''">
+                        -
+                      </xsl:if>
+                    </TD>
+                    <TD>
+                      <xsl:if test="not(@val_loc_ann = '')">
+                        <xsl:value-of select="@val_loc_ann" />&nbsp;
+                      </xsl:if>
+                      <xsl:if test="@val_loc_ann = ''">
+                        -
+                      </xsl:if>
+                    </TD>
+                    <TD>
+                      <xsl:if test="not(@l_nat_exon = '')">
+                        <xsl:value-of select="@l_nat_exon" />&nbsp;
+                      </xsl:if>
+                      <xsl:if test="@l_nat_exon = ''">
+                        -
+                      </xsl:if>
+                    </TD>
+                  </TR>
+                </xsl:for-each>
+              </Table>
+
+              <xsl:if test ="Mj_Pev/Mj_Habit_Descr[@num_pev]">
+                <hr size="5"/>
+                <h4>
+                  Habitation principale
+                  <BR/>
+                </h4>
+                <h5>
+                  N° P.E.V : <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@num_pev" />
+                </h5>
+                <Table cellspacing="2" cellpadding="5">
+                  <TR>
+                    <TH width="30%">
+                      Divers
+                    </TH>
+                    <TH width="40%">
+                      Eléments de confort
+                    </TH>
+                    <TH width="10%">
+                      Pièces
+                    </TH>
+                    <TH width="20">
+                      Surfaces (m²)
+                    </TH>
+                  </TR>
+                  <TR>
+                    <TD width="30%">
+                      <Table cellspacing="2" cellpadding="5">
+                        <TR>
+                          <TD align ="left">
+                            Surface (m²) :
+                          </TD>
+
+                          <TD align ="right">
+                            <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@suf_piece_total" />&nbsp;
+                          </TD>
+
+                        </TR>
+                        <TR>
+                          <TD align ="left">
+                            Nbr pièces :
+                          </TD>
+
+                          <TD align ="right">
+                            <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_piece_total" />&nbsp;
+                          </TD>
+
+                        </TR>
+                        <TR>
+                          <TD align ="left">
+                            Nbr pièces princ. :
+                          </TD>
+
+                          <TD align ="right">
+                            <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_piece_principal" />&nbsp;
+                          </TD>
+
+                        </TR>
+                        <TR>
+                          <TD align ="left">
+                            Entretien :
+                          </TD>
+
+                          <TD align ="right">
+                            <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@l_Etat" />&nbsp;
+                          </TD>
+
+                        </TR>
+                        <TR>
+                          <TD align ="left">
+                            Année de Constr. :
+                          </TD>
+
+                          <TD align ="right">
+                            <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@annee_constr" />&nbsp;
+                          </TD>
+
+                        </TR>
+                        <TR>
+                          <TD align ="left">
+                            Nbr Niveaux :
+                          </TD>
+
+                          <TD align ="right">
+                            <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_niveaux" />&nbsp;
+                          </TD>
+
+                        </TR>
+                        <TR>
+                          <TD align ="left">
+                            Gros murs :
+                          </TD>
+
+                          <TD align ="right">
+                            <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@lib_mat_gros_mur" />&nbsp;
+                          </TD>
+
+                        </TR>
+                        <TR>
+                          <TD align ="left">
+                            Toitures :
+                          </TD>
+
+                          <TD align ="right">
+                            <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@lib_mat_toiture" />&nbsp;
+                          </TD>
+
+                        </TR>
+                      </Table>
+                    </TD>
+                    <TD width="40%">
+                      <Table cellspacing="2" cellpadding="5">
+                        <xsl:if test="Mj_Pev/Mj_Habit_Descr/@nb_baignoires &gt; 0">
+                          <TR>
+                            <TD align ="left">
+                              <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_baignoires" />&nbsp;
+                            </TD>
+                            <TD align ="left" width ="75%">
+                              Baignoire(s)
+                            </TD>
+                          </TR>
+                        </xsl:if>
+
+                        <xsl:if test="Mj_Pev/Mj_Habit_Descr/@nb_douches &gt; 0">
+                          <TR>
+                            <TD align ="left">
+                              <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_douches" />&nbsp;
+                            </TD>
+                            <TD align ="left" width ="75%">
+                              Douche(s)
+                            </TD>
+                          </TR>
+                        </xsl:if>
+
+                        <xsl:if test="Mj_Pev/Mj_Habit_Descr/@nb_lavabos &gt; 0">
+                          <TR>
+                            <TD align ="left">
+                              <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_lavabos" />&nbsp;
+                            </TD>
+                            <TD align ="left" width ="75%">
+                              Lavabo(s)
+                            </TD>
+                          </TR>
+                        </xsl:if>
+
+                        <xsl:if test="Mj_Pev/Mj_Habit_Descr/@nb_wc &gt; 0">
+                          <TR>
+                            <TD align ="left">
+                              <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_wc" />&nbsp;
+                            </TD>
+                            <TD align ="left" width ="75%">
+                              W.C.
+                            </TD>
+                          </TR>
+                        </xsl:if>
+                        
+                        
+                        <TR>
+                          <TD align ="left">
+                            Eau :
+                          </TD>
+                          <TD align ="left" width ="75%">
+                            <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@eau = 'EAU'">
+                              Oui
+                            </xsl:if>
+                            <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@eau = ''">
+                              -
+                            </xsl:if>
+                          </TD>
+                        </TR>
+                        <TR>
+                          <TD align ="left">
+                            Electricité :
+                          </TD>
+                          <TD align ="left" width ="75%">
+                            <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@elect = 'ELECT'">
+                              Oui
+                            </xsl:if>
+                            <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@elect = ''">
+                              -
+                            </xsl:if>
+                          </TD>
+                        </TR>
+                        <TR>
+                          <TD align ="left">
+                            Gaz :
+                          </TD>
+                          <TD align ="left" width ="75%">
+                            <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@gaz = 'GAZ'">
+                              Oui
+                            </xsl:if>
+                            <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@gaz = ''">
+                              -
+                            </xsl:if>
+                          </TD>
+                        </TR>
+                        <TR>
+                          <TD align ="left">
+                            Esc. de service :
+                          </TD>
+                          <TD align ="left" width ="75%">
+                            <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@esc_serv = 'ESC_SERV'">
+                              Oui
+                            </xsl:if>
+                            <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@esc_serv = ''">
+                              -
+                            </xsl:if>
+                          </TD>
+                        </TR>
+                        <TR>
+                          <TD align ="left">
+                            Ascenseur :
+                          </TD>
+                          <TD align ="left" width ="75%">
+                            <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@asc = 'ASC'">
+                              Oui
+                            </xsl:if>
+                            <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@asc = ''">
+                              -
+                            </xsl:if>
+                          </TD>
+                        </TR>
+                        <TR>
+                          <TD align ="left">
+                            Chauffage :
+                          </TD>
+                          <TD align ="left" width ="75%">
+                            <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@chauf = 'CHAUF'">
+                              Oui
+                            </xsl:if>
+                            <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@chauf = ''">
+                              -
+                            </xsl:if>
+                          </TD>
+                        </TR>
+                        <TR>
+                          <TD align ="left">
+                            Vide ordure :
+                          </TD>
+                          <TD align ="left" width ="75%">
+                            <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@vide_ord = 'VIDE_ORD'">
+                              Oui
+                            </xsl:if>
+                            <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@vide_ord = ''">
+                              -
+                            </xsl:if>
+                          </TD>
+                        </TR>
+                        <TR>
+                          <TD align ="left">
+                            Égout :
+                          </TD>
+                          <TD align ="left" width ="75%">
+                            <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@egout = 'EGOUT'">
+                              Oui
+                            </xsl:if>
+                            <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@egout = ''">
+                              -
+                            </xsl:if>
+                          </TD>
+                        </TR>
+                      </Table>
+                    </TD>
+                    <TD width="15%">
+                      <Table cellspacing="2" cellpadding="5">
+                        <TR>
+
+                          <TD align ="left">
+                            <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_sam" />&nbsp;
+                          </TD>
+
+                          <TD align ="left" width ="75%">
+                            S. a manger
+                          </TD>
+                        </TR>
+                        <TR>
+
+                          <TD align ="left">
+                            <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_chambre" />&nbsp;
+                          </TD>
+
+                          <TD align ="left" width ="75%">
+                            Chambre
+                          </TD>
+                        </TR>
+                        <TR>
+
+                          <TD align ="left">
+                            <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_cuisine_m9" />&nbsp;
+                          </TD>
+
+                          <TD align ="left" width ="75%">
+                            Cuisine (inf.9m2)
+                          </TD>
+                        </TR>
+                        <TR>
+
+                          <TD align ="left">
+                            <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_cuisine_p9" />&nbsp;
+                          </TD>
+
+                          <TD align ="left" width ="75%">
+                            Cuisine (sup.9m2)
+                          </TD>
+                        </TR>
+                        <TR>
+
+                          <TD align ="left">
+                            <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_salle_eau" />&nbsp;
+                          </TD>
+
+                          <TD align ="left" width ="75%">
+                            S. de bain
+                          </TD>
+                        </TR>
+                        <TR>
+
+                          <TD align ="left">
+                            <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_annexe" />&nbsp;
+                          </TD>
+
+                          <TD align ="left" width ="75%">
+                            Annexe
+                          </TD>
+                        </TR>
+                      </Table>
+                    </TD>
+                    <TD width="15%">
+                      <Table cellspacing="2" cellpadding="5">
+                        <TR>
+
+                          <TD align ="left">
+                            <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@suf_cave" />&nbsp;
+                          </TD>
+                          <TD align ="left" width ="75%">
+                            Cave(s)&nbsp;
+                          </TD>
+
+                        </TR>
+                        <TR>
+
+                          <TD align ="left">
+                            <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@suf_grenier" />&nbsp;
+                          </TD>
+                          <TD align ="left" width ="75%">
+                            Grenier(s)&nbsp;
+                          </TD>
+
+                        </TR>
+                        <TR>
+
+                          <TD align ="left">
+                            <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@suf_terrasse" />&nbsp;
+                          </TD>
+                          <TD align ="left" width ="75%">
+                            Terrasse(s)&nbsp;
+                          </TD>
+
+                        </TR>
+                        <TR>
+
+                          <TD align ="left">
+                            <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@suf_garage" />&nbsp;
+                          </TD>
+                          <TD align ="left" width ="75%">
+                            Garage(s)&nbsp;
+                          </TD>
+
+                        </TR>
+                      </Table>
+                    </TD>
+                  </TR>
+                </Table>
+              </xsl:if>
+              <xsl:if test ="Mj_Pev/Mj_Depend_Descr[@num_pev]">
+                <hr size="5"/>
+                <h4>
+                  Dépendance(s)
+                </h4>
+                <Table cellspacing="2" cellpadding="5">
+                  <TR>
+                    <TH>
+                      N°
+                    </TH>
+                    <TH>
+                      Nature
+                    </TH>
+                    <TH>
+                      Surface (m²)
+                    </TH>
+                    <TH>
+                      Pondération
+                    </TH>
+                    <TH>
+                      Entretien
+                    </TH>
+                    <TH>
+                      Gros murs
+                    </TH>
+                    <TH>
+                      Toitures
+                    </TH>
+                    <TH>
+                      Elt. confort
+                    </TH>
+                  </TR>
+                  <TR>
+
+                    <TD>
+                      <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@num_pev" />&nbsp;
+                    </TD>
+                    <TD>
+                      <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@nature" />&nbsp;
+                    </TD>
+                    <TD>
+                      <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@surface" />&nbsp;
+                    </TD>
+                    <TD>
+                      <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@ponderation" />&nbsp;
+                    </TD>
+                    <TD>
+                      <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@l_Etat" />&nbsp;
+                    </TD>
+                    <TD>
+                      <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@lib_mat_gros_mur" />&nbsp;
+                    </TD>
+                    <TD>
+                      <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@lib_mat_toiture" />&nbsp;
+                    </TD>
+
+                    <TD>
+                      <Table cellspacing="2" cellpadding="5">
+                        <xsl:if test="Mj_Pev/Mj_Depend_Descr/@nb_baignoires &gt; 0">
+                          <TR>
+                            <TD align ="left">
+                              <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@nb_baignoires" />&nbsp;
+                            </TD>
+                            <TD align ="left" width ="75%">
+                              Baignoire(s)
+                            </TD>
+                          </TR>
+                        </xsl:if>
+
+                        <xsl:if test="Mj_Pev/Mj_Depend_Descr/@nb_douches &gt; 0">
+                          <TR>
+                            <TD align ="left">
+                              <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@nb_douches" />&nbsp;
+                            </TD>
+                            <TD align ="left" width ="75%">
+                              Douche(s)
+                            </TD>
+                          </TR>
+                        </xsl:if>
+
+                        <xsl:if test="Mj_Pev/Mj_Depend_Descr/@nb_lavabos &gt; 0">
+                          <TR>
+                            <TD align ="left">
+                              <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@nb_lavabos" />&nbsp;
+                            </TD>
+                            <TD align ="left" width ="75%">
+                              Lavabo(s)
+                            </TD>
+                          </TR>
+                        </xsl:if>
+
+                        <xsl:if test="Mj_Pev/Mj_Depend_Descr/@nb_wc &gt; 0">
+                          <TR>
+                            <TD align ="left">
+                              <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@nb_wc" />&nbsp;
+                            </TD>
+                            <TD align ="left" width ="75%">
+                              W.C.
+                            </TD>
+                          </TR>
+                        </xsl:if>
+                        <TR>
+                          <TD align ="left">
+                            Eau :
+                          </TD>
+                          <TD align ="left" width ="75%">
+                            <xsl:if test ="Mj_Pev/Mj_Depend_Descr/@eau = 'EAU'">
+                              Oui
+                            </xsl:if>
+                            <xsl:if test ="Mj_Pev/Mj_Depend_Descr/@eau = ''">
+                              -
+                            </xsl:if>
+                          </TD>
+                        </TR>
+                        <TR>
+                          <TD align ="left">
+                            Chauffage :
+                          </TD>
+                          <TD align ="left" width ="75%">
+                            <xsl:if test ="Mj_Pev/Mj_Depend_Descr/@chauf = 'CHAUF'">
+                              Oui
+                            </xsl:if>
+                            <xsl:if test ="Mj_Pev/Mj_Depend_Descr/@chauf = ''">
+                              -
+                            </xsl:if>
+                          </TD>
+                        </TR>
+                        <TR>
+                          <TD align ="left">
+                            Electricité :
+                          </TD>
+                          <TD align ="left" width ="75%">
+                            <xsl:if test ="Mj_Pev/Mj_Depend_Descr/@elect = 'ELECT'">
+                              Oui
+                            </xsl:if>
+                            <xsl:if test ="Mj_Pev/Mj_Depend_Descr/@elect = ''">
+                              -
+                            </xsl:if>
+                          </TD>
+                        </TR>
+                      </Table>
+                    </TD>
+                  </TR>
+                </Table>
+              </xsl:if>
+              <xsl:if test ="Mj_Pev/Mj_Prof_Descr[@num_pev]">
+                <hr size="5"/>
+                <h4>
+                  Locaux Professionnels
+                </h4>
+                <Table cellspacing="2" cellpadding="5">
+                  <TR>
+                    <TH>
+                      N°
+                    </TH>
+                    <TH>
+                      Surface (m²)
+                    </TH>
+                  </TR>
+                  <TR>
+                    <TD>
+                      <xsl:value-of select="Mj_Pev/Mj_Prof_Descr/@num_pev" />
+                    </TD>
+                    <TD>
+                      <xsl:value-of select="Mj_Pev/Mj_Prof_Descr/@surface" />
+                    </TD>
+                  </TR>
+                </Table>
+              </xsl:if>
+            </xsl:for-each>
+          </xsl:if>
+        </xsl:if>
+      </body>
+    </html>
+  </xsl:template>
+</xsl:stylesheet>
+
diff --git a/src/module_cadastreV2/web_service/class/majic_libV2/xsl/FP_New.xslt b/src/module_cadastreV2/web_service/class/majic_libV2/xsl/FP_New.xslt
new file mode 100755
index 0000000000000000000000000000000000000000..89c143675d9771aebb2fb1e299becb364c81f141
--- /dev/null
+++ b/src/module_cadastreV2/web_service/class/majic_libV2/xsl/FP_New.xslt
@@ -0,0 +1,1000 @@
+<?xsl version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE xsl:stylesheet [
+  <!ENTITY nbsp "&#160;">
+]>
+<html xsl:version="1.0"
+      xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+      lang="fr"
+      
+      >
+     
+      
+        <head>
+          <!--<link rel="stylesheet" href="C:\\svn\\lib\\majic_lib\\xsl\\style.css" type="text/css" />-->
+          <link href="style.css" type="text/css" rel="stylesheet" />
+          
+        </head>
+		    <body>
+          <hr size="5"/>
+          <h1>
+            <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle">
+              Parcelle <xsl:value-of select="@section" /><xsl:value-of select="@num_parc" />
+            </xsl:for-each>
+          </h1>
+          <hr size="10"/>
+          <Table cellspacing="2" cellpadding="5" >
+            <TR>
+              <TH align="left" width ="15%">
+                Adresse :
+              </TH>
+              <TD align="left" width ="85%">
+                <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle">
+                  <xsl:value-of select="@adresse" />
+                </xsl:for-each>
+              </TD>
+            </TR>
+            <TR>
+              <TH align="left" width ="15%">
+                Commune :
+              </TH>
+              <TD align="left" width ="85%">
+                <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle">
+                  <xsl:value-of select="@libcom" />
+                </xsl:for-each>  
+              </TD>
+            </TR>
+            <TR>
+              <TH align="left" width ="15%">
+                Code Commune (Insee) :
+              </TH>
+              <TD align="left" width ="85%">
+                <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle">
+                  <xsl:value-of select="@codeinsee" />
+                </xsl:for-each>
+              </TD>
+            </TR>
+            <TR>
+              <TH align="left" width ="15%">
+                Cpte Propriétaire :
+              </TH>
+              <TD align="left" width ="85%">
+                <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle">
+                  <xsl:value-of select="Mj_Parcelle/@dnupro" /> <BR/>
+                </xsl:for-each>
+              </TD>
+            </TR>
+            <TR>
+              <TH align="left" width ="15%">
+                Surface cadastrale (m²) :
+              </TH>
+              <TD align="left" width ="85%">
+                <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle">
+                   <xsl:value-of select="@total_contenance_m2" /> 
+                </xsl:for-each>
+              </TD>
+            </TR>
+            <TR>
+              <TH align="left" width ="15%">
+                Urbaine :
+              </TH>
+              <TD align="left" width ="85%">
+                A Chercher ???
+              </TD>
+            </TR>
+            <TR>
+              <TH align="left" width ="15%">
+                Bâtie :
+              </TH>
+              <TD align="left" width ="85%">
+                <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle">
+                  <xsl:value-of select="@gparbat" />
+                </xsl:for-each>
+              </TD>
+            </TR>
+            <TR>
+              <TH align="left" width ="15%">
+                Parcelle primitive :
+              </TH>
+              <TD align="left" width ="85%">
+                A Chercher ???
+              </TD>
+            </TR>
+           </Table>
+          <img>
+            <xsl:attribute name="src">
+              <xsl:value-of select = "concat('http://www.maison-passive-nice.fr/images/','parcelle.gif')"/>
+            </xsl:attribute>
+          </img>          
+            <hr size="5"/>
+            <h4>
+              Propriétaire(s) de la parcelle
+            </h4>
+          <Table cellspacing="2" cellpadding="5">
+            <TR>
+              <TH>
+                Compte
+              </TH>
+              <TH>
+                Nom
+              </TH>
+              <TH>
+                Etat Civil
+              </TH>
+              <TH>
+                Adresse
+              </TH>
+              <TH>
+                Type
+              </TH>
+            </TR>
+            <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Proprietaire">
+            <TR>
+              <TD>
+                <xsl:value-of select="@dnupro" />&nbsp;
+              </TD>
+              <TD>
+                <xsl:value-of select="@proprietaire_nom_tiers" />&nbsp;
+              </TD>
+              <TD>
+                <xsl:value-of select="@jdatnss" />
+                <BR/>
+                <xsl:value-of select="@dldnss" />&nbsp;
+              </TD>
+              <TD>
+                <xsl:value-of select="@proprietaire_adresse" />&nbsp;
+              </TD>
+              <TD>
+                <xsl:value-of select="@l_ccodro" /> &nbsp;
+              </TD>
+            </TR>
+            </xsl:for-each>
+          </Table>
+          <hr size="5"/>
+          <h4>
+            Subdivision(s) Fiscale(s)
+          </h4>
+          <Table cellspacing="2" cellpadding="5">
+            <TR>
+              <TH>
+                Lettre
+              </TH>
+              <TH>
+                groupe
+              </TH>
+              <TH>
+                Nature
+              </TH>
+              <TH>
+                Occupation
+              </TH>
+              <TH>
+                Classe
+              </TH>
+              <TH>
+                Compte
+              </TH>
+              <TH>
+                Surface (m²)
+              </TH>
+              <TH>
+                Revenu (€)
+              </TH>
+              <TH>
+                Référence
+              </TH>
+            </TR>
+            <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle/Mj_Suf">
+              <TR>
+                <TD>
+                  <xsl:value-of select="@suf" />&nbsp;
+                </TD>
+                <TD>
+                  <xsl:value-of select="@grss_gr" />&nbsp;
+                </TD>
+                <TD>
+                  <xsl:value-of select="@nat_cult" />&nbsp;
+                </TD>
+                <TD>
+                  ???
+                </TD>
+                <TD>
+                  <xsl:value-of select="@clas" />&nbsp;
+                </TD>
+                <TD>
+                  <xsl:value-of select="@dnupro" />&nbsp;
+                </TD>
+                <TD>
+                  <xsl:value-of select="@contenance_suf" />&nbsp;
+                </TD>
+                <TD>
+                  <xsl:value-of select="@revenu_cadastral_txt" />&nbsp;
+                </TD>
+                <TD>
+                  <xsl:value-of select="@revenu_reference_txt" />&nbsp;
+                </TD>
+              </TR>
+            </xsl:for-each>
+          </Table>
+          <hr size="5"/>
+          <h4>
+            Elément(s) Bâti(s)
+          </h4>
+          <Table cellspacing="2" cellpadding="5">
+            <TR>
+              <TH>
+                Ref. local
+              </TH>
+              <TH>
+                Nature
+              </TH>
+              <TH>
+                Date mutation
+              </TH>
+              <TH>
+                Propriétaire(s)
+              </TH>
+            </TR>
+            <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Bati">
+            <TR>
+              <TD>
+					<a href="<xsl:value-of select="@num_invar" />"><xsl:value-of select="@num_invar" /></a>&nbsp;
+              </TD>
+              <TD>
+                <xsl:value-of select="@nature" />&nbsp;
+              </TD>
+              <TD>
+                <xsl:value-of select="@date_mut" />&nbsp;
+              </TD>
+              <TD>
+                <xsl:value-of select="Mj_Proprietaire/@proprietaire_nom" />&nbsp;
+              </TD>
+            </TR>
+            </xsl:for-each>
+          </Table>
+          <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Bati">
+          <hr size="15"/>
+          <h1>
+            
+            <a name="<xsl:value-of select="@num_invar" />">Local n° <xsl:value-of select="@num_invar" /></a>
+            
+          </h1>
+          <hr size="10"/>           
+          <Table cellspacing="2" cellpadding="5">
+            <TR>
+              <TH align="left" width="39%">
+                
+              </TH>
+              <TH align="left" width="40%">
+                
+              </TH>
+              <TH align="center" width="7%">
+                Bat
+              </TH>
+              <TH align="center" width="7%">
+                Esc
+              </TH>
+              <TH align="center" width="7%">
+                Etage
+              </TH>
+            </TR>
+            
+            <TR>
+              <TH align="left" width="39%">
+                Adresse :
+              </TH>
+              <TD align="left" width="40%">
+                <xsl:value-of select="@voirie" />&nbsp;<xsl:value-of select="@adresse" />&nbsp;
+              </TD>
+              <TD align="center" width="7%">
+                <xsl:value-of select="@bat" />&nbsp;
+              </TD>
+              <TD align="center" width="7%">
+                <xsl:value-of select="@ent" />&nbsp;
+              </TD>
+              <TD align="center" width="7%">
+                <xsl:value-of select="@niv" />&nbsp;
+              </TD>
+            </TR>
+            <TR>
+              <TH align="left" width="39%">
+                Commune :
+              </TH>
+              <TD align="left" width="40%">
+                <xsl:value-of select="@libcom" />&nbsp;
+              </TD>
+              <TD align="center" width="7%">
+
+              </TD>
+              <TD align="center" width="7%">
+
+              </TD>
+              <TD align="center" width="7%">
+
+              </TD>
+            </TR>
+            <TR>
+              <TH align="left" width="39%">
+                Type :
+              </TH>
+              <TD align="left" width="40%">
+                <xsl:value-of select="@dteloc" />&nbsp;
+              </TD>
+              <TD align="center" width="7%">
+
+              </TD>
+              <TD align="center" width="7%">
+
+              </TD>
+              <TD align="center" width="7%">
+
+              </TD>
+            </TR>
+            <TR>
+              <TH align="left" width="39%">
+                Occupation :
+              </TH>
+              <TD align="left" width="40%">
+                <xsl:value-of select="@occupation" />&nbsp;
+              </TD>
+              <TD align="center" width="7%">
+
+              </TD>
+              <TD align="center" width="7%">
+
+              </TD>
+              <TD align="center" width="7%">
+
+              </TD>
+            </TR>
+            <TR>
+              <TH align="left" width="39%">
+                Nature :
+              </TH>
+              <TD align="left" width="40%">
+                <xsl:value-of select="@nature" />&nbsp;
+              </TD>
+              <TD align="center" width="7%">
+
+              </TD>
+              <TD align="center" width="7%">
+
+              </TD>
+              <TD align="center" width="7%">
+
+              </TD>
+            </TR>
+            <TR>
+              <TH align="left" width="39%">
+                Année de construction :
+              </TH>
+              <TD align="left" width="40%">
+                <xsl:value-of select="@annee_constr" />&nbsp;
+              </TD>
+              <TD align="center" width="7%">
+
+              </TD>
+              <TD align="center" width="7%">
+
+              </TD>
+              <TD align="center" width="7%">
+
+              </TD>
+            </TR>
+            <TR>
+              <TH align="left" width="39%">
+                Date de mutation :
+              </TH>
+              <TD align="left" width="40%">
+                <xsl:value-of select="@date_mut" />&nbsp;
+              </TD>
+              <TD align="center" width="7%">
+
+              </TD>
+              <TD align="center" width="7%">
+
+              </TD>
+              <TD align="center" width="7%">
+
+              </TD>
+            </TR>
+            <TR>
+              <TH align="left" width="39%">
+                Valeur cadastrale (€) :
+              </TH>
+              <TD align="left" width="40%">
+                ????
+              </TD>
+              <TD align="center" width="7%">
+
+              </TD>
+              <TD align="center" width="7%">
+
+              </TD>
+              <TD align="center" width="7%">
+
+              </TD>
+            </TR>
+            <TR>
+              <TH align="left" width="39%">
+                Niveaux :
+              </TH>
+              <TD align="left" width="40%">
+                <xsl:value-of select="@niveaux" />&nbsp;
+              </TD>
+              <TD align="center" width="7%">
+
+              </TD>
+              <TD align="center" width="7%">
+
+              </TD>
+              <TD align="center" width="7%">
+
+              </TD>
+            </TR>
+            
+          </Table>
+          <hr size="5"/>
+            <h4>
+              Propriétaire(s) du local
+            </h4>
+            <Table cellspacing="2" cellpadding="5">
+              <TR>
+                <TH>
+                  Compte
+                </TH>
+                <TH>
+                  Nom
+                </TH>
+                <TH>
+                  État Civil
+                </TH>
+                <TH>
+                  Adresse
+                </TH>
+                <TH>
+                  Type
+                </TH>
+              </TR>
+
+              <TR>
+                <TD>
+                  <xsl:value-of select="Mj_Proprietaire/@dnupro" />&nbsp;
+                </TD>
+                <TD>
+                  <xsl:value-of select="Mj_Proprietaire/@proprietaire_nom" />&nbsp;
+                </TD>
+                <TD>
+                  <xsl:value-of select="Mj_Proprietaire/@jdatnss" />
+                  <BR/>
+                  <xsl:value-of select="Mj_Proprietaire/@dldnss" />&nbsp;
+                </TD>
+                <TD>
+                  <xsl:value-of select="Mj_Proprietaire/@proprietaire_adresse" />&nbsp;
+                </TD>
+                <TD>
+                  <xsl:value-of select="Mj_Proprietaire/@l_ccodro" />&nbsp;
+                </TD>
+              </TR>
+
+            </Table>
+            <hr size="5"/>
+          <h4>
+            P.E.V
+          </h4>
+          <Table cellspacing="2" cellpadding="5">
+            <TR>
+              <TH>
+                N°
+              </TH>
+              <TH>
+                Nature
+              </TH>
+              <TH>
+                Catégorie
+              </TH>
+              <TH>
+                Tarif
+              </TH>
+              <TH>
+                Local Type
+              </TH>
+              <TH>
+                Val. Loc. Ref. (€)
+              </TH>
+              <TH>
+                Val. Loc. Ann. (€)
+              </TH>
+              <TH>
+                Nat. Exemp.
+              </TH>
+            </TR>
+            
+            <TR>
+              <TD>
+                <xsl:value-of select="Mj_Pev/@num_pev" />&nbsp;
+              </TD>
+              <TD>
+                <xsl:value-of select="Mj_Pev/@af" />&nbsp;
+              </TD>
+              <TD>
+                <xsl:value-of select="Mj_Pev/@cat" />&nbsp;
+              </TD>
+              <TD>
+                <xsl:value-of select="Mj_Pev/@s_tar" />&nbsp;
+              </TD>
+              <TD>
+                <xsl:value-of select="Mj_Pev/@local_type" />&nbsp;
+              </TD>
+              <TD>
+                <xsl:value-of select="Mj_Pev/@val_loc_ref" />&nbsp;
+              </TD>
+              <TD>
+                <xsl:value-of select="Mj_Pev/@val_loc_ann" />&nbsp;
+              </TD>
+              <TD>
+                <xsl:value-of select="Mj_Pev/@nature" />&nbsp;
+              </TD>
+            </TR>            
+          </Table>
+
+          <xsl:if test ="Mj_Pev/Mj_Habit_Descr[@num_pev]"> 
+          <hr size="5"/>
+          <h4>
+            Habitation principale
+            <BR/>
+          </h4>
+            <h5>
+              N° P.E.V : <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@num_pev" />
+            </h5>
+          <Table cellspacing="2" cellpadding="5">
+            <TR>
+              <TH width="30%">
+                Divers
+              </TH>
+              <TH width="40%">
+                Eléments de confort
+              </TH>
+              <TH width="10%">
+                Pièces
+              </TH>
+              <TH width="20">
+                Surfaces (m²)
+              </TH>
+            </TR>
+            <TR>
+              <TD width="30%">
+                <Table cellspacing="2" cellpadding="5">
+                  <TR>
+                    <TD align ="left">
+                      Surface (m²) :
+                    </TD>
+                    
+                    <TD align ="right">
+                      <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@suf_piece_total" />&nbsp;
+                    </TD>
+                   
+                  </TR>
+                  <TR>
+                    <TD align ="left">
+                      Nbr pièces :
+                    </TD>
+                    
+                      <TD align ="right">
+                        <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_piece_total" />&nbsp;
+                      </TD>
+                    
+                  </TR>
+                  <TR>
+                    <TD align ="left">
+                      Nbr pièces princ. :
+                    </TD>
+                    
+                      <TD align ="right">
+                        <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_piece_principal" />&nbsp;
+                      </TD>
+                    
+                  </TR>
+                  <TR>
+                    <TD align ="left">
+                      Entretien :
+                    </TD>
+                    
+                      <TD align ="right">
+                        <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@Etat" />&nbsp;
+                      </TD>
+                    
+                  </TR>
+                  <TR>
+                    <TD align ="left">
+                      Année de Constr. :
+                    </TD>
+                    
+                      <TD align ="right">
+                        <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@annee_constr" />&nbsp;
+                      </TD>
+                    
+                  </TR>
+                  <TR>
+                    <TD align ="left">
+                      Nbr Niveaux :
+                    </TD>
+                    
+                      <TD align ="right">
+                        <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_niveaux" />&nbsp;
+                      </TD>
+                   
+                  </TR>
+                  <TR>
+                    <TD align ="left">
+                      Gros murs :
+                    </TD>
+                    
+                      <TD align ="right">
+                        <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@mat_gros_mur" />&nbsp;
+                      </TD>
+                    
+                  </TR>
+                  <TR>
+                    <TD align ="left">
+                      Toitures : 
+                    </TD>
+                    
+                      <TD align ="right">
+                        <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@mat_toiture" />&nbsp;
+                      </TD>
+                    
+                  </TR>
+                </Table>
+              </TD> 
+              <TD width="40%">
+                <Table cellspacing="2" cellpadding="5">
+                  <TR>
+                    <TD align ="left">
+                      <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_baignoires" />&nbsp;
+                    </TD>
+                    <TD align ="left" width ="75%">
+                      Baignoire(s)
+                    </TD>
+                  </TR>
+                  <TR>
+                    
+                      <TD align ="left">
+                        <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_douches" />&nbsp;
+                      </TD>
+                    
+                    <TD align ="left" width ="75%">
+                      Douche(s)
+                    </TD>
+                  </TR>
+                  <TR>
+                    
+                      <TD align ="left">
+                        <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_lavabos" />&nbsp;
+                      </TD>
+                    
+                    <TD align ="left" width ="75%">
+                      Lavabo(s)
+                    </TD>  
+                  </TR>
+                  <TR>
+                    
+                      <TD align ="left">
+                        <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_wc" />&nbsp;
+                      </TD>
+                  
+                    <TD align ="left" width ="75%">
+                      W.C.
+                    </TD>
+                  </TR>
+                  <TR>
+                    <TD align ="left">
+                       Eau :
+                    </TD>
+                    <TD align ="left" width ="75%">
+                       <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@eau" />&nbsp;
+                    </TD>
+                  </TR>
+                  <TR>
+                    <TD align ="left">
+                      Electricité :
+                    </TD>
+                    <TD align ="left" width ="75%">
+                      <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@elect" />&nbsp;
+                    </TD>
+                  </TR>
+                  <TR>
+                    <TD align ="left">
+                      Gaz :
+                    </TD>
+                    <TD align ="left" width ="75%">
+                      <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@gaz" />&nbsp;
+                    </TD>
+                  </TR>
+                  <TR>
+                    <TD align ="left">
+                      Esc. de service :
+                    </TD>
+                    <TD align ="left" width ="75%">
+                      <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@esc_serv" />&nbsp;
+                    </TD>
+                  </TR>
+                  <TR>
+                    <TD align ="left">
+                      Ascenseur :
+                    </TD>
+                    <TD align ="left" width ="75%">
+                      <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@asc" />&nbsp;
+                    </TD>
+                  </TR>
+                  <TR>
+                    <TD align ="left">
+                      Chauffage :
+                    </TD>
+                    <TD align ="left" width ="75%">
+                      <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@chauf" />&nbsp;
+                    </TD>
+                  </TR>
+                  <TR>
+                    <TD align ="left">
+                      Vide ordure :
+                    </TD>
+                    <TD align ="left" width ="75%">
+                      <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@vide_ord" />&nbsp;
+                    </TD>
+                  </TR>
+                  <TR>
+                    <TD align ="left">
+                      Égout :
+                    </TD>
+                    <TD align ="left" width ="75%">
+                      <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@egout" />&nbsp;
+                    </TD>
+                  </TR>
+                </Table>
+              </TD>
+              <TD width="15%">
+                <Table cellspacing="2" cellpadding="5">
+                  <TR>
+                    
+                      <TD align ="left">
+                        <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_sam" />&nbsp;
+                      </TD>
+                    
+                    <TD align ="left" width ="75%">
+                      S. a manger
+                    </TD>
+                  </TR>
+                  <TR>
+                    
+                      <TD align ="left">
+                        <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_chambre" />&nbsp;
+                      </TD>
+                    
+                    <TD align ="left" width ="75%">
+                      Chambre
+                    </TD>
+                  </TR>
+                  <TR>
+                    
+                      <TD align ="left">
+                        <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_cuisine_m9" />&nbsp;
+                      </TD>
+                    
+                    <TD align ="left" width ="75%">
+                      Cuisine (inf.9m2)
+                    </TD>
+                  </TR>
+                  <TR>
+
+                    <TD align ="left">
+                      <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_cuisine_p9" />&nbsp;
+                    </TD>
+
+                    <TD align ="left" width ="75%">
+                      Cuisine (sup.9m2)
+                    </TD>
+                  </TR>
+                  <TR>
+                    
+                      <TD align ="left">
+                        <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_salle_eau" />&nbsp;
+                      </TD>
+                    
+                    <TD align ="left" width ="75%">
+                      S. de bain
+                    </TD>
+                  </TR>
+                  <TR>
+                    
+                      <TD align ="left">
+                        <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_annexe" />&nbsp;
+                      </TD>
+                    
+                    <TD align ="left" width ="75%">
+                      Annexe
+                    </TD>
+                  </TR>
+                </Table>
+              </TD>
+              <TD width="15%">
+                <Table cellspacing="2" cellpadding="5">
+                  <TR>
+                  
+                      <TD align ="left">
+                        <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@suf_cave" />&nbsp;
+                      </TD>
+                      <TD align ="left" width ="75%">
+                        <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@cave" />&nbsp;
+                      </TD>
+                    
+                  </TR>
+                  <TR>
+                    
+                      <TD align ="left">
+                        <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@suf_grenier" />&nbsp;
+                      </TD>
+                      <TD align ="left" width ="75%">
+                        <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@grenier" />&nbsp;
+                      </TD>
+                    
+                  </TR>
+                  <TR>
+                    
+                      <TD align ="left">
+                        <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@suf_terrasse" />&nbsp;
+                      </TD>
+                      <TD align ="left" width ="75%">
+                        <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@terrasse" />&nbsp;
+                      </TD>
+                    
+                  </TR>
+                  <TR>
+                   
+                      <TD align ="left">
+                        <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@suf_garage" />&nbsp;
+                      </TD>
+                      <TD align ="left" width ="75%">
+                        <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@garage" />&nbsp;
+                      </TD>
+                    
+                  </TR>
+                </Table>
+              </TD>
+            </TR>
+          </Table>
+          </xsl:if>
+          <xsl:if test ="Mj_Pev/Mj_Depend_Descr[@num_pev]">
+            <hr size="5"/>
+            <h4>
+              Dépendance(s)
+            </h4>
+            <Table cellspacing="2" cellpadding="5">
+              <TR>
+                <TH>
+                  N°
+                </TH>
+                <TH>
+                  Nature
+                </TH>
+                <TH>
+                  Surface (m²)
+                </TH>
+                <TH>
+                  Pondération
+                </TH>
+                <TH>
+                  Entretien
+                </TH>
+                <TH>
+                  Gros murs
+                </TH>
+                <TH>
+                  Toitures
+                </TH>
+                <TH>
+                  Elt. confort
+                </TH>
+              </TR>
+              <TR>
+
+                <TD>
+                  <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@num_depend" />&nbsp;
+                </TD>
+                <TD>
+                  <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@nature" />&nbsp;
+                </TD>
+                <TD>
+                  <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@surface" />&nbsp;
+                </TD>
+                <TD>
+                  <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@ponderation" />&nbsp;
+                </TD>
+                <TD>
+                  <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@Etat" />&nbsp;
+                </TD>
+                <TD>
+                  <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@mat_gros_mur" />&nbsp;
+                </TD>
+                <TD>
+                  <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@mat_toiture" />&nbsp;
+                </TD>
+
+                <TD>
+
+                  (<xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@eau" />) (<xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@elect" />) (<xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@chauf" />)&nbsp;
+
+                  <Table cellspacing="2" cellpadding="5">
+                    <TR>
+
+                      <TD align ="left">
+                        <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@nb_baignoires" />&nbsp;
+                      </TD>
+
+                      <TD align ="left" width ="75%">
+                        Baignoire(s)
+                      </TD>
+                    </TR>
+                    <TR>
+
+                      <TD align ="left">
+                        <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@nb_douches" />&nbsp;
+                      </TD>
+
+                      <TD align ="left" width ="75%">
+                        Douche(s)
+                      </TD>
+
+                    </TR>
+                    <TR>
+
+                      <TD align ="left">
+                        <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@nb_lavabos" />&nbsp;
+                      </TD>
+
+                      <TD align ="left" width ="75%">
+                        Lavabo(s)
+                      </TD>
+                    </TR>
+                    <TR>
+
+                      <TD align ="left">
+                        <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@nb_wc" />&nbsp;
+                      </TD>
+
+                      <TD align ="left" width ="75%">
+                        W.C.
+                      </TD>
+                    </TR>
+                  </Table>
+                </TD>
+              </TR>
+            </Table>
+          </xsl:if>
+            <xsl:if test ="Mj_Pev/Mj_Prof_Descr[@num_pev]">
+              <hr size="5"/>
+              <h4>
+                Locaux Professionnels
+              </h4>
+              <Table cellspacing="2" cellpadding="5">
+                <TR>
+                  <TH>
+                    N°
+                  </TH>
+                  <TH>
+                    Surface (m²)
+                  </TH>
+                </TR>
+                <TR>
+                  <TD>
+                    <xsl:value-of select="Mj_Pev/Mj_Prof_Descr/@num_pev" />
+                  </TD>
+                  <TD>
+                    <xsl:value-of select="Mj_Pev/Mj_Prof_Descr/@surface" />
+                  </TD>
+                </TR>
+              </Table>
+            </xsl:if>
+          </xsl:for-each>
+        </body> 
+   </html>
+    
diff --git a/src/module_cadastreV2/web_service/class/majic_libV2/xsl/FP_fo_Complet.xsl b/src/module_cadastreV2/web_service/class/majic_libV2/xsl/FP_fo_Complet.xsl
new file mode 100755
index 0000000000000000000000000000000000000000..1ce443f25421b218f9d7409768da6d1b32330d51
--- /dev/null
+++ b/src/module_cadastreV2/web_service/class/majic_libV2/xsl/FP_fo_Complet.xsl
@@ -0,0 +1,1762 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  <xsl:template match="/">
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="simple" page-width="21cm" page-height="29.7cm" margin-top="0.5cm" margin-bottom="0.5cm" margin-left="0.5cm" margin-right="0.5cm">
+          <fo:region-body margin-top="0cm" margin-bottom="0cm" margin-left="0.5cm" margin-right="0.5cm" />
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+
+      <fo:page-sequence master-reference="simple" font-family="Times">
+        <!-- Tableau global basé sur la structure de la première ligne du relevé de propriété -->
+        <fo:flow flow-name="xsl-region-body">
+          
+          <fo:block >
+            <fo:external-graphic >
+              <xsl:attribute name="src">
+                file:///C:\serveurs\Apache2\htdocs\rgd\images\bandeau.jpg
+              </xsl:attribute>
+            </fo:external-graphic>
+          </fo:block>
+
+          <fo:block color="#F1B4B4">
+            <fo:leader leader-length="100%" leader-pattern="rule"/>
+          </fo:block>
+          <fo:block text-align="left" vertical-align="middle" font-size="17pt" color="#008393">
+            <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle">
+              Parcelle <xsl:value-of select="@section" /><xsl:value-of select="format-number(@num_parc, '0000')"/> 
+            </xsl:for-each>
+          </fo:block>
+          <fo:block color="#F1B4B4">
+            <fo:leader leader-length="100%" leader-pattern="rule"/>
+          </fo:block>
+          <fo:table margin-bottom="35px" table-layout="fixed" width="100%" border-separation="2" >
+            <fo:table-column column-width="17%" />
+            <fo:table-column column-width="83%" />
+            <fo:table-body>
+              <fo:table-row>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Adresse :</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#F7F7F7" text-align="left"  padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@num_voirie" />
+                      <xsl:value-of select="@adresse" />
+                    </fo:block>
+                  </xsl:for-each>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Commune :</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#F7F7F7" text-align="left"  padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@libcom" />
+                    </fo:block>
+                  </xsl:for-each>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Code Commune (Insee) :</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#F7F7F7" text-align="left"  padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@codeinsee" />
+                    </fo:block>
+                  </xsl:for-each>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Cpte Propriétaire :</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#F7F7F7" text-align="left"  padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="Mj_Parcelle/@dnupro" />
+                    </fo:block>
+                    <!-- retour chariot -->
+                  </xsl:for-each>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Surface cadastrale (m²) :</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#F7F7F7" text-align="left"  padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@total_contenance_m2" />
+                    </fo:block>
+                  </xsl:for-each>
+                </fo:table-cell>
+              </fo:table-row>
+
+              <fo:table-row>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Urbaine :</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#F7F7F7" text-align="left"  padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@gurbpa" />
+                    </fo:block>
+                  </xsl:for-each>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Bâtie :</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#F7F7F7" text-align="left"  padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@gparbat" />
+                    </fo:block>
+                  </xsl:for-each>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Parcelle primitive :</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#F7F7F7" text-align="left"  padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:if test="not(@num_parc_prim = '')">
+                        <xsl:value-of select="@num_parc_prim" />
+                      </xsl:if>
+                      <xsl:if test="@num_parc_prim = ''">
+                        -
+                      </xsl:if>
+                    </fo:block>
+                  </xsl:for-each>
+                </fo:table-cell>
+              </fo:table-row>
+            </fo:table-body>
+          </fo:table>
+
+          <!--<fo:block>
+            <fo:external-graphic>
+              <xsl:attribute name="src">
+                http://mapsrv.rgd74.fr/geomap70/mg/net/ggGetMapImage.aspx?USER=Administrator&amp;PWD=admin&amp;MAPNAME=Library://RISNET_GESTION/Cartes/RGD 73-74 - RISNET_GESTION_73_74.MapDefinition&amp;SELOBJS=PARCELLE%2C<xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle">
+                  <xsl:value-of select='substring(@idpar,1,2)'/>
+                  <xsl:value-of select='substring(@idpar,4,3)'/>
+                  <xsl:if test ="substring(@idpar,7,3)='000'">
+                    <xsl:text disable-output-escaping="yes">-.-.-</xsl:text>
+                  </xsl:if>
+                  <xsl:if test ="not(substring(@idpar,7,3)='000')">
+                    <xsl:value-of select='substring(@idpar,7,3)'/>
+                  </xsl:if>
+                  <xsl:if test ="substring(@idpar,10,1)='0'">
+                    <xsl:text disable-output-escaping="yes">-</xsl:text>
+                  </xsl:if>
+                  <xsl:if test ="not(substring(@idpar,10,1)='0')">
+                    <xsl:value-of select='substring(@idpar,10,1)'/>
+                  </xsl:if>
+                  <xsl:value-of select='substring(@idpar,11,1)'/>
+                  <xsl:value-of select='substring(@idpar,12)'/>
+                </xsl:for-each>-&amp;CENTERX=&amp;CENTERY=&amp;SCALE=*8&amp;HEIGHT=400&amp;WIDTH=575&amp;RESULTTYPE=JPG
+              </xsl:attribute>
+            </fo:external-graphic>
+          </fo:block>-->
+          <fo:block text-align="left" vertical-align="middle" font-size="13pt" color="#990000">
+            Urbanisme : POS/PLU
+          </fo:block>
+          
+          <fo:table margin-bottom="35px" table-layout="fixed" width="100%" border-separation="2">
+            <fo:table-column column-width="9%" />
+            <fo:table-column column-width="27.48%" />
+            <fo:table-column column-width="15.38%" />
+            <fo:table-column column-width="7.29%" />
+            <fo:table-column column-width="7.29%" />
+            <fo:table-column column-width="9.79%" />
+            <fo:table-column column-width="23.77%" />
+
+            <fo:table-body>
+              <fo:table-row>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Zonage</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Libellé</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Surface (m2)*</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">COS</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">CES</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Hauteur</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Réglement de la zone</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+              <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle/Mj_PosPlu">
+                <fo:table-row>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@zonage" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@lib_zonage" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@surface" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@cos" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@ces" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@hauteur" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block color="blue" text-decoration="underline" text-align="left" vertical-align="middle" font-size="9pt">
+                      <fo:basic-link>
+                        <xsl:attribute name="external-destination">
+                          http://mapris.rgd74.fr/DocumentsPartenaires/Reglement_POS/ <xsl:value-of select="@idreg" />.pdf
+                        </xsl:attribute>Consulter le réglement
+                      </fo:basic-link>
+                    </fo:block>
+                  </fo:table-cell>
+                </fo:table-row>
+              </xsl:for-each>
+            </fo:table-body>
+          </fo:table>
+          <fo:block text-align="left" vertical-align="middle" font-size="8pt">
+            *calcul sur la surface graphique, exclusion si surf &#139; 2 m²
+          </fo:block>
+          <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle/Mj_PosPlu">
+            <fo:block color="blue" text-decoration="underline" text-align="left" vertical-align="middle" font-size="9pt">
+              <fo:basic-link>
+                <xsl:attribute name="external-destination">
+                  http://mapris.rgd74.fr/Risnet_Gestion/Application/Rapport/etat_pos_plu/fiche_pos.asp?codcom=<xsl:value-of select="@codecom" />
+                </xsl:attribute>Avancement de l'actualisation/mise en ligne du POS/PLU de cette commune
+              </fo:basic-link>
+            </fo:block>
+          </xsl:for-each>
+
+          <fo:block color="#F1B4B4">
+            <fo:leader leader-length="100%" leader-pattern="rule"/>
+          </fo:block>
+          <fo:block text-align="left" vertical-align="middle" font-size="13pt" color="#990000">
+            Propriétaire(s) de la parcelle
+          </fo:block>
+          <fo:block text-align="left" vertical-align="middle" font-size="8pt">
+            *Cliquer sur le n° de compte pour accéder à son relevé de propriété
+          </fo:block>
+          <fo:table margin-bottom="35px" table-layout="fixed" width="100%" border-separation="2">
+            <fo:table-column column-width="12%" />
+            <fo:table-column column-width="12%" />
+            <fo:table-column column-width="20%" />
+            <fo:table-column column-width="15%" />
+            <fo:table-column column-width="26%" />
+            <fo:table-column column-width="15%" />
+
+            <fo:table-body>
+              <fo:table-row>
+                <fo:table-cell number-columns-spanned="2" background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Compte</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Nom</fo:block>
+                </fo:table-cell>
+
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Etat Civil</fo:block>
+                </fo:table-cell>
+
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Adresse</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Type</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+              <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Proprietaire">
+                <fo:table-row>
+                  <fo:table-cell number-columns-spanned="2" background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block color="blue" text-decoration="underline" text-align="left" vertical-align="middle" font-size="9pt">
+                        <fo:basic-link>
+                          <xsl:attribute name="external-destination">
+                            http://localhost/rgd/rgdservices.phtml?operation=GetReleveprop&amp;compte=<xsl:value-of select="@dnupro"/>&amp;type=complet&amp;format=pdf&amp;version=1.0
+                          </xsl:attribute><xsl:value-of select="@dnupro" />
+                        </fo:basic-link>
+                      </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@proprietaire_nom" />
+                    </fo:block>
+                  </fo:table-cell>
+
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@jdatnss" />
+                    </fo:block>
+                    <!-- retour chariot -->
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@dldnss" />
+                    </fo:block>
+                  </fo:table-cell>
+
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@proprietaire_adresse" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@l_ccodro" />
+                    </fo:block>
+                  </fo:table-cell>
+                </fo:table-row>
+                <xsl:if test ="..//Mj_Parcelle/Mj_Suf/Mj_Proprietaire[@dnupro]">
+                  <fo:table-row>
+                    <fo:table-cell number-columns-spanned="6" background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">Détail</fo:block>
+                    </fo:table-cell>
+                  </fo:table-row>
+                  <fo:table-row>
+                    <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">Numéro du lot</fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">Compte</fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">Nom</fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">Etat Civil</fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">Adresse</fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">Type</fo:block>
+                    </fo:table-cell>
+                  </fo:table-row>
+                  <xsl:for-each select="../Mj_Parcelle/Mj_Suf/Mj_Proprietaire">
+                    <fo:table-row>
+                      <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                        <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                          <xsl:value-of select="../@dnulot" />
+                        </fo:block>
+                      </fo:table-cell>
+                      <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                        <fo:block color="blue" text-decoration="underline" text-align="left" vertical-align="middle" font-size="9pt">
+                          <fo:basic-link>
+                            <xsl:attribute name="external-destination">
+                              http://localhost/rgd/rgdservices.phtml?operation=GetReleveprop&amp;compte=<xsl:value-of select="@dnupro"/>&amp;type=complet&amp;format=pdf&amp;version=1.0
+                            </xsl:attribute>
+                            <xsl:value-of select="@dnupro" />
+                          </fo:basic-link>
+                        </fo:block>
+                      </fo:table-cell>
+                      <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                        <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                          <xsl:value-of select="@proprietaire_nom" />
+                        </fo:block>
+                      </fo:table-cell>
+                      <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                        <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                          <xsl:value-of select="@jdatnss" />
+                        </fo:block>
+                        <!-- retour chariot -->
+                        <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                          <xsl:value-of select="@dldnss" />
+                        </fo:block>
+                      </fo:table-cell>
+                      <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                        <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                          <xsl:value-of select="@proprietaire_adresse" />
+                        </fo:block>
+                      </fo:table-cell>
+                      <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                        <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                          <xsl:value-of select="@l_ccodro" />
+                        </fo:block>
+                      </fo:table-cell>
+                    </fo:table-row>
+                  </xsl:for-each>
+                </xsl:if>
+              </xsl:for-each>
+            </fo:table-body>
+          </fo:table>
+
+          <fo:block text-align="left" vertical-align="middle" font-size="13pt" color="#990000">
+            Subdivision(s) fiscale(s)
+          </fo:block>
+          <fo:table margin-bottom="35px" table-layout="fixed" width="100%" border-separation="2">
+
+            <fo:table-column column-width="11%" />
+            <fo:table-column column-width="11%" />
+            <fo:table-column column-width="11%" />
+            <fo:table-column column-width="11.2%" />
+            <fo:table-column column-width="11%" />
+            <fo:table-column column-width="11.2%" />
+            <fo:table-column column-width="11.2%" />
+            <fo:table-column column-width="11.2%" />
+            <fo:table-column column-width="11.2%" />
+
+            <fo:table-body>
+              <fo:table-row>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Lettre</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Groupe</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Nature</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Occupation</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Classe</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Compte</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Surface (m²)</fo:block>
+                </fo:table-cell>
+
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Revenu (€)</fo:block>
+                </fo:table-cell>
+
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Référence</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+              <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle/Mj_Suf">
+                <fo:table-row>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:if test="not(@suf = '')">
+                        <xsl:value-of select="@suf" />
+                      </xsl:if>
+                      <xsl:if test="@suf = ''">
+                        -
+                      </xsl:if>
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:if test="not(@groupe = '')">
+                        <xsl:value-of select="@groupe" />
+                      </xsl:if>
+                      <xsl:if test="@groupe = ''">
+                        -
+                      </xsl:if>
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:if test="not(@nature = '')">
+                        <xsl:value-of select="@nature" />
+                      </xsl:if>
+                      <xsl:if test="@nature = ''">
+                        -
+                      </xsl:if>
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">-</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:if test="not(@clas = '')">
+                        <xsl:value-of select="@clas" />
+                      </xsl:if>
+                      <xsl:if test="@clas = ''">
+                        -
+                      </xsl:if>
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@dnupro" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@contenance_suf" />
+                    </fo:block>
+                  </fo:table-cell>
+
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@revenu_cadastral_txt" />
+                    </fo:block>
+                  </fo:table-cell>
+
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@revenu_reference_txt" />
+                    </fo:block>
+                  </fo:table-cell>
+                </fo:table-row>
+              </xsl:for-each>
+            </fo:table-body>
+          </fo:table>
+
+          <xsl:if test="count(Mj/Mj_Compte_Communal_Parcelle/Mj_Bati) &gt; 0">
+            <fo:block color="#F1B4B4">
+              <fo:leader leader-length="100%" leader-pattern="rule"/>
+            </fo:block>
+            <fo:block text-align="left" vertical-align="middle" font-size="13pt" color="#990000">
+              Elément(s) bâti(s)
+            </fo:block>
+            <fo:table margin-bottom="35px" table-layout="fixed" width="100%" border-separation="2">
+
+              <fo:table-column column-width="15%" />
+              <fo:table-column column-width="15%" />
+              <fo:table-column column-width="15%" />
+              <fo:table-column column-width="55%" />
+
+              <fo:table-body>
+                <fo:table-row>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">Ref. local</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">Nature</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">Date mutation</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">Propriétaire(s)</fo:block>
+                  </fo:table-cell>
+                </fo:table-row>
+                <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Bati">
+                  <xsl:for-each select="Mj_Proprietaire">
+                    <fo:table-row>
+                      <xsl:if test="position()='1'">
+                        <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                          <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                            <xsl:value-of select="../@num_invar" />
+                          </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                          <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                            <xsl:value-of select="../@lib_nature" />
+                          </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                          <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                            <xsl:value-of select="../@date_mut" />
+                          </fo:block>
+                        </fo:table-cell>
+                      </xsl:if>
+                      <xsl:if test="position() &gt; '1'">
+                        <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                          <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                          </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                          <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                          </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                          <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                          </fo:block>
+                        </fo:table-cell>
+                      </xsl:if>
+                      <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                        <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                          <xsl:value-of select="@proprietaire_nom" />
+                        </fo:block>
+                      </fo:table-cell>
+                    </fo:table-row>
+                  </xsl:for-each>
+                </xsl:for-each>
+              </fo:table-body>
+            </fo:table>
+          </xsl:if>
+          <!-- .........................................Description du local, mode Complet................................................. -->
+          <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Bati">
+            <fo:block color="#F1B4B4">
+              <fo:leader leader-length="100%" leader-pattern="rule"/>
+            </fo:block>
+            <fo:block text-align="left" vertical-align="middle" font-size="15pt" color="#008393">
+              Local n° <xsl:value-of select="@num_invar" />
+            </fo:block>
+
+            <fo:block color="#F1B4B4">
+              <fo:leader leader-length="100%" leader-pattern="rule"/>
+            </fo:block>
+            <fo:table margin-bottom="35px" table-layout="fixed" width="100%" border-separation="2" >
+
+              <fo:table-column column-width="39%" />
+              <fo:table-column column-width="40%" />
+              <fo:table-column column-width="7%" />
+              <fo:table-column column-width="7%" />
+              <fo:table-column column-width="7%" />
+
+              <fo:table-body>
+                <fo:table-row>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt"></fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt"></fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#eeeeee" text-align="center" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">Bat</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#eeeeee" text-align="center" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">Esc</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#eeeeee" text-align="center" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">Etage</fo:block>
+                  </fo:table-cell>
+                </fo:table-row>
+
+                <fo:table-row>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">Adresse :</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@voirie" />
+                      <xsl:value-of select="@adresse" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="center" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@bat" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="center" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@ent" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="center" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@niv" />
+                    </fo:block>
+                  </fo:table-cell>
+                </fo:table-row>
+                <fo:table-row>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">Commune :</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@libcom" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="center" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt"></fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="center" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt"></fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="center" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt"></fo:block>
+                  </fo:table-cell>
+                </fo:table-row>
+                <fo:table-row>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">Type :</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@dteloc" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="center" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt"></fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="center" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt"></fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="center" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt"></fo:block>
+                  </fo:table-cell>
+                </fo:table-row>
+                <fo:table-row>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">Occupation :</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@lib_occupation" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="center" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt"></fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="center" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt"></fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="center" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt"></fo:block>
+                  </fo:table-cell>
+                </fo:table-row>
+                <fo:table-row>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">Nature :</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@lib_nature" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="center" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt"></fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="center" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt"></fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="center" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt"></fo:block>
+                  </fo:table-cell>
+                </fo:table-row>
+                <fo:table-row>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">Année de construction :</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:if test="not(@annee_constr = '0')">
+                        <xsl:value-of select="@annee_constr" />
+                      </xsl:if>
+                      <xsl:if test="@annee_constr = '0'">
+                        -
+                      </xsl:if>
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="center" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt"></fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="center" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt"></fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="center" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt"></fo:block>
+                  </fo:table-cell>
+                </fo:table-row>
+                <fo:table-row>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">Date de mutation :</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@date_mut" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="center" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt"></fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="center" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt"></fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="center" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt"></fo:block>
+                  </fo:table-cell>
+                </fo:table-row>
+                <fo:table-row>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">Valeur cadastrale (?) :</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="Mj_Pev/@revenu_cadastral" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="center" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt"></fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="center" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt"></fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="center" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt"></fo:block>
+                  </fo:table-cell>
+                </fo:table-row>
+                <fo:table-row>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">Niveaux :</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@niveaux" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="center" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt"></fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="center" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt"></fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="center" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt"></fo:block>
+                  </fo:table-cell>
+                </fo:table-row>
+              </fo:table-body>
+            </fo:table>
+
+            <fo:block color="#F1B4B4">
+              <fo:leader leader-length="100%" leader-pattern="rule"/>
+            </fo:block>
+
+            <fo:block text-align="left" vertical-align="middle" font-size="13pt" color="#990000">
+              Propriétaire(s) du local
+            </fo:block>
+
+            <fo:table margin-bottom="35px" table-layout="fixed" width="100%" border-separation="2">
+              <fo:table-column column-width="15%" />
+              <fo:table-column column-width="27.5%" />
+              <fo:table-column column-width="15%" />
+              <fo:table-column column-width="27.5%" />
+              <fo:table-column column-width="15%" />
+
+              <fo:table-body>
+                <fo:table-row>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">Compte</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">Nom</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">État Civil</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">Adresse</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">Type</fo:block>
+                  </fo:table-cell>
+                </fo:table-row>
+
+                <xsl:for-each select="Mj_Proprietaire">
+                  <fo:table-row>
+                    <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block color="blue" text-decoration="underline" text-align="left" vertical-align="middle" font-size="9pt">
+                        <fo:basic-link>
+                          <xsl:attribute name="external-destination">
+                            http://localhost/rgd/rgdservices.phtml?operation=GetReleveprop&amp;compte=<xsl:value-of select="@dnupro"/>&amp;type=complet&amp;format=pdf&amp;version=1.0
+                          </xsl:attribute>
+                          <xsl:value-of select="@dnupro" />
+                        </fo:basic-link>
+                      </fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                        <xsl:value-of select="@proprietaire_nom" />
+                      </fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                        <xsl:value-of select="@jdatnss" />
+                        <!-- retour chariot -->
+                        <xsl:value-of select="@dldnss" />
+                      </fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                        <xsl:value-of select="@proprietaire_adresse" />
+                      </fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                        <xsl:value-of select="@l_ccodro" />
+                      </fo:block>
+                    </fo:table-cell>
+                  </fo:table-row>
+                </xsl:for-each>
+              </fo:table-body>
+            </fo:table>
+
+            <fo:block color="#F1B4B4">
+              <fo:leader leader-length="100%" leader-pattern="rule"/>
+            </fo:block>
+            <fo:block text-align="left" vertical-align="middle" font-size="13pt" color="#990000">
+              P.E.V
+            </fo:block>
+            <fo:table margin-bottom="35px" table-layout="fixed" width="100%" border-separation="2">
+
+              <fo:table-column column-width="12.5%" />
+              <fo:table-column column-width="12.5%" />
+              <fo:table-column column-width="12.5%" />
+              <fo:table-column column-width="12.5%" />
+              <fo:table-column column-width="12.5%" />
+              <fo:table-column column-width="12.5%" />
+              <fo:table-column column-width="12.5%" />
+              <fo:table-column column-width="12.5%" />
+
+              <fo:table-body>
+                <fo:table-row>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">N°</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">Nature</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">Catégorie</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">Tarif</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">Local Type</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">Val. Loc. Ref. (?)</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">Val. Loc. Ann. (?)</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">Nat. Exemp.</fo:block>
+                  </fo:table-cell>
+                </fo:table-row>
+
+                <xsl:for-each select="Mj_Pev">
+                  <fo:table-row>
+                    <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                        <xsl:if test="not(@num_pev = '')">
+                          <xsl:value-of select="@num_pev" />
+                        </xsl:if>
+                        <xsl:if test="@num_pev = ''">
+                          -
+                        </xsl:if>
+                      </fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                        <xsl:if test="not(@l_nature = '')">
+                          <xsl:value-of select="@l_nature" />
+                        </xsl:if>
+                        <xsl:if test="@l_nature = ''">
+                          -
+                        </xsl:if>
+                      </fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                        <xsl:if test="not(@cat = '')">
+                          <xsl:value-of select="@cat" />
+                        </xsl:if>
+                        <xsl:if test="@cat = ''">
+                          -
+                        </xsl:if>
+                      </fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                        <xsl:if test="not(@s_tar = '')">
+                          <xsl:value-of select="@s_tar" />
+                        </xsl:if>
+                        <xsl:if test="@s_tar = ''">
+                          -
+                        </xsl:if>
+                      </fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                        <xsl:if test="not(@local_type = '')">
+                          <xsl:value-of select="@local_type" />
+                        </xsl:if>
+                        <xsl:if test="@local_type = ''">
+                          -
+                        </xsl:if>
+                      </fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                        <xsl:if test="not(@val_loc_ref = '')">
+                          <xsl:value-of select="@val_loc_ref" />
+                        </xsl:if>
+                        <xsl:if test="@val_loc_ref = ''">
+                          -
+                        </xsl:if>
+                      </fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                        <xsl:if test="not(@val_loc_ann = '')">
+                          <xsl:value-of select="@val_loc_ann" />
+                        </xsl:if>
+                        <xsl:if test="@val_loc_ann = ''">
+                          -
+                        </xsl:if>
+                      </fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                        <xsl:if test="not(@l_nat_exon = '')">
+                          <xsl:value-of select="@l_nat_exon" />
+                        </xsl:if>
+                        <xsl:if test="@l_nat_exon = ''">
+                          -
+                        </xsl:if>
+                      </fo:block>
+                    </fo:table-cell>
+                  </fo:table-row>
+                </xsl:for-each>
+              </fo:table-body>
+            </fo:table>
+
+            <xsl:if test ="Mj_Pev/Mj_Habit_Descr[@num_pev]">
+              <fo:block color="#F1B4B4">
+                <fo:leader leader-length="100%" leader-pattern="rule"/>
+              </fo:block>
+              <fo:block text-align="left" vertical-align="middle" font-size="13pt" color="#990000">
+                Habitation principale
+                <!-- retour chariot -->
+              </fo:block>
+              <fo:block text-align="left" vertical-align="middle" font-size="8pt">
+                N° P.E.V : <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@num_pev" />
+              </fo:block>
+              <fo:table margin-bottom="35px" table-layout="fixed" width="100%" border-separation="2">
+
+                <fo:table-column column-width="30%" />
+                <fo:table-column column-width="30%" />
+                <fo:table-column column-width="20%" />
+                <fo:table-column column-width="20%" />
+
+                <fo:table-body>
+                  <fo:table-row>
+                    <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">Divers</fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">Eléments de confort</fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">Pièces</fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">Surfaces (m²)</fo:block>
+                    </fo:table-cell>
+                  </fo:table-row>
+                  <fo:table-row>
+                    <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:table table-layout="fixed" width="100%" border-separation="2">
+
+                        <fo:table-column column-width="60%" />
+                        <fo:table-column column-width="40%" />
+
+                        <fo:table-body>
+                          <fo:table-row>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">Surface (m²) :</fo:block>
+                            </fo:table-cell>
+
+                            <fo:table-cell background-color="#F7F7F7" text-align ="right" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@suf_piece_total" />
+                              </fo:block>
+                            </fo:table-cell>
+
+                          </fo:table-row>
+                          <fo:table-row>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">Nbr pièces :</fo:block>
+                            </fo:table-cell>
+
+                            <fo:table-cell background-color="#F7F7F7" text-align ="right" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_piece_total" />
+                              </fo:block>
+                            </fo:table-cell>
+
+                          </fo:table-row>
+                          <fo:table-row>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">Nbr pièces princ. :</fo:block>
+                            </fo:table-cell>
+
+                            <fo:table-cell background-color="#F7F7F7" text-align ="right" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_piece_principal" />
+                              </fo:block>
+                            </fo:table-cell>
+
+                          </fo:table-row>
+                          <fo:table-row>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">Entretien :</fo:block>
+                            </fo:table-cell>
+
+                            <fo:table-cell background-color="#F7F7F7" text-align ="right" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@l_Etat" />
+                              </fo:block>
+                            </fo:table-cell>
+
+                          </fo:table-row>
+                          <fo:table-row>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">Année de Constr. :</fo:block>
+                            </fo:table-cell>
+
+                            <fo:table-cell background-color="#F7F7F7" text-align ="right" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@annee_constr" />
+                              </fo:block>
+                            </fo:table-cell>
+
+                          </fo:table-row>
+                          <fo:table-row>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">Nbr Niveaux :</fo:block>
+                            </fo:table-cell>
+
+                            <fo:table-cell background-color="#F7F7F7" text-align ="right" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_niveaux" />
+                              </fo:block>
+                            </fo:table-cell>
+
+                          </fo:table-row>
+                          <fo:table-row>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">Gros murs :</fo:block>
+                            </fo:table-cell>
+
+                            <fo:table-cell background-color="#F7F7F7" text-align ="right" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@lib_mat_gros_mur" />
+                              </fo:block>
+                            </fo:table-cell>
+
+                          </fo:table-row>
+                          <fo:table-row>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">Toitures :</fo:block>
+                            </fo:table-cell>
+
+                            <fo:table-cell background-color="#F7F7F7" text-align ="right" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@lib_mat_toiture" />
+                              </fo:block>
+                            </fo:table-cell>
+
+                          </fo:table-row>
+                        </fo:table-body>
+                      </fo:table>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:table table-layout="fixed" width="100%" border-separation="2">
+
+                        <fo:table-column column-width="50%" />
+                        <fo:table-column column-width="50%" />
+
+                        <fo:table-body>
+                          <xsl:if test="Mj_Pev/Mj_Habit_Descr/@nb_baignoires &gt; 0">
+                            <fo:table-row>
+                              <fo:table-cell background-color="#F7F7F7" text-align ="left"  padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                                <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                  <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_baignoires" />
+                                </fo:block>
+                              </fo:table-cell>
+                              <fo:table-cell background-color="#F7F7F7" text-align ="left"  padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                                <fo:block text-align="left" vertical-align="middle" font-size="9pt">Baignoire(s)</fo:block>
+                              </fo:table-cell>
+                            </fo:table-row>
+                          </xsl:if>
+                          <xsl:if test="Mj_Pev/Mj_Habit_Descr/@nb_douches &gt; 0">
+                            <fo:table-row>
+                              <fo:table-cell background-color="#F7F7F7" text-align ="left"  padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                                <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                  <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_douches" />
+                                </fo:block>
+                              </fo:table-cell>
+                              <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                                <fo:block text-align="left" vertical-align="middle" font-size="9pt">Douche(s)</fo:block>
+                              </fo:table-cell>
+                            </fo:table-row>
+                          </xsl:if>
+                          <xsl:if test="Mj_Pev/Mj_Habit_Descr/@nb_lavabos &gt; 0">
+                            <fo:table-row>
+                              <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                                <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                  <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_lavabos" />
+                                </fo:block>
+                              </fo:table-cell>
+                              <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                                <fo:block text-align="left" vertical-align="middle" font-size="9pt">Lavabo(s)</fo:block>
+                              </fo:table-cell>
+                            </fo:table-row>
+                          </xsl:if>
+                          <xsl:if test="Mj_Pev/Mj_Habit_Descr/@nb_wc &gt; 0">
+                            <fo:table-row>
+                              <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                                <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                  <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_wc" />
+                                </fo:block>
+                              </fo:table-cell>
+                              <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                                <fo:block text-align="left" vertical-align="middle" font-size="9pt">W.C.</fo:block>
+                              </fo:table-cell>
+                            </fo:table-row>
+                          </xsl:if>
+                          <fo:table-row>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">Eau :</fo:block>
+                            </fo:table-cell>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@eau = 'EAU'">
+                                  Oui
+                                </xsl:if>
+                              </fo:block>
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@eau = ''">
+                                  -
+                                </xsl:if>
+                              </fo:block>
+                            </fo:table-cell>
+                          </fo:table-row>
+                          <fo:table-row>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">Electricité :</fo:block>
+                            </fo:table-cell>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@elect = 'ELECT'">
+                                  Oui
+                                </xsl:if>
+                              </fo:block>
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@elect = ''">
+                                  -
+                                </xsl:if>
+                              </fo:block>
+                            </fo:table-cell>
+                          </fo:table-row>
+                          <fo:table-row>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">Gaz :</fo:block>
+                            </fo:table-cell>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@gaz = 'GAZ'">
+                                  Oui
+                                </xsl:if>
+                              </fo:block>
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@gaz = ''">
+                                  -
+                                </xsl:if>
+                              </fo:block>
+                            </fo:table-cell>
+                          </fo:table-row>
+                          <fo:table-row>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">Esc. de service :</fo:block>
+                            </fo:table-cell>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@esc_serv = 'ESC_SERV'">
+                                  Oui
+                                </xsl:if>
+                              </fo:block>
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@esc_serv = ''">
+                                  -
+                                </xsl:if>
+                              </fo:block>
+                            </fo:table-cell>
+                          </fo:table-row>
+                          <fo:table-row>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">Ascenseur :</fo:block>
+                            </fo:table-cell>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@asc = 'ASC'">
+                                  Oui
+                                </xsl:if>
+                              </fo:block>
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@asc = ''">
+                                  -
+                                </xsl:if>
+                              </fo:block>
+                            </fo:table-cell>
+                          </fo:table-row>
+                          <fo:table-row>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">Chauffage :</fo:block>
+                            </fo:table-cell>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@chauf = 'CHAUF'">
+                                  Oui
+                                </xsl:if>
+                              </fo:block>
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@chauf = ''">
+                                  -
+                                </xsl:if>
+                              </fo:block>
+                            </fo:table-cell>
+                          </fo:table-row>
+                          <fo:table-row>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">Vide ordure :</fo:block>
+                            </fo:table-cell>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@vide_ord = 'VIDE_ORD'">
+                                  Oui
+                                </xsl:if>
+                              </fo:block>
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@vide_ord = ''">
+                                  -
+                                </xsl:if>
+                              </fo:block>
+                            </fo:table-cell>
+                          </fo:table-row>
+                          <fo:table-row>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">Égout :</fo:block>
+                            </fo:table-cell>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@egout = 'EGOUT'">
+                                  Oui
+                                </xsl:if>
+                              </fo:block>
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:if test ="Mj_Pev/Mj_Habit_Descr/@egout = ''">
+                                  -
+                                </xsl:if>
+                              </fo:block>
+                            </fo:table-cell>
+                          </fo:table-row>
+                        </fo:table-body>
+                      </fo:table>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:table table-layout="fixed" width="100%" border-separation="2">
+
+                        <fo:table-column column-width="30%" />
+                        <fo:table-column column-width="70%" />
+
+                        <fo:table-body>
+                          <fo:table-row>
+
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left"  padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_sam" />
+                              </fo:block>
+                            </fo:table-cell>
+
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">S. a manger</fo:block>
+                            </fo:table-cell>
+                          </fo:table-row>
+                          <fo:table-row>
+
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_chambre" />
+                              </fo:block>
+                            </fo:table-cell>
+
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">Chambre</fo:block>
+                            </fo:table-cell>
+                          </fo:table-row>
+                          <fo:table-row>
+
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_cuisine_m9" />
+                              </fo:block>
+                            </fo:table-cell>
+
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">Cuisine (inf.9m2)</fo:block>
+                            </fo:table-cell>
+                          </fo:table-row>
+                          <fo:table-row>
+
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_cuisine_p9" />
+                              </fo:block>
+                            </fo:table-cell>
+
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">Cuisine (sup.9m2)</fo:block>
+                            </fo:table-cell>
+                          </fo:table-row>
+                          <fo:table-row>
+
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_salle_eau" />
+                              </fo:block>
+                            </fo:table-cell>
+
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">S. de bain</fo:block>
+                            </fo:table-cell>
+                          </fo:table-row>
+                          <fo:table-row>
+
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@nb_annexe" />
+                              </fo:block>
+                            </fo:table-cell>
+
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">Annexe</fo:block>
+                            </fo:table-cell>
+                          </fo:table-row>
+                        </fo:table-body>
+                      </fo:table>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:table table-layout="fixed" width="100%" border-separation="2">
+
+                        <fo:table-column column-width="30%" />
+                        <fo:table-column column-width="70%" />
+
+                        <fo:table-body>
+                          <fo:table-row>
+
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@suf_cave" />
+                              </fo:block>
+                            </fo:table-cell>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                Cave(s)
+                              </fo:block>
+                            </fo:table-cell>
+
+                          </fo:table-row>
+                          <fo:table-row>
+
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@suf_grenier" />
+                              </fo:block>
+                            </fo:table-cell>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                Grenier(s)
+                              </fo:block>
+                            </fo:table-cell>
+
+                          </fo:table-row>
+                          <fo:table-row>
+
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@suf_terrasse" />
+                              </fo:block>
+                            </fo:table-cell>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                Terrasse(s)
+                              </fo:block>
+                            </fo:table-cell>
+
+                          </fo:table-row>
+                          <fo:table-row>
+
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:value-of select="Mj_Pev/Mj_Habit_Descr/@suf_garage" />
+                              </fo:block>
+                            </fo:table-cell>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                Garage(s)
+                              </fo:block>
+                            </fo:table-cell>
+
+                          </fo:table-row>
+                        </fo:table-body>
+                      </fo:table>
+                    </fo:table-cell>
+                  </fo:table-row>
+                </fo:table-body>
+              </fo:table>
+            </xsl:if>
+            <xsl:if test ="Mj_Pev/Mj_Depend_Descr[@num_pev]">
+              <fo:block color="#F1B4B4">
+                <fo:leader leader-length="100%" leader-pattern="rule"/>
+              </fo:block>
+              <fo:block text-align="left" vertical-align="middle" font-size="13pt" color="#990000">
+                Dépendance(s)
+              </fo:block>
+              <fo:table margin-bottom="35px" table-layout="fixed" width="100%" border-separation="2">
+
+                <fo:table-column column-width="10%" />
+                <fo:table-column column-width="12.5%" />
+                <fo:table-column column-width="11%" />
+                <fo:table-column column-width="11%" />
+                <fo:table-column column-width="11%" />
+                <fo:table-column column-width="12.5%" />
+                <fo:table-column column-width="12.5%" />
+                <fo:table-column column-width="19.5%" />
+
+                <fo:table-body>
+                  <fo:table-row>
+                    <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">N°</fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">Nature</fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">Surface (m²)</fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">Pondération</fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">Entretien</fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">Gros murs</fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">Toitures</fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">Elt. confort</fo:block>
+                    </fo:table-cell>
+                  </fo:table-row>
+                  <fo:table-row>
+
+                    <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                        <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@num_pev" />
+                      </fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                        <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@nature" />
+                      </fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                        <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@surface" />
+                      </fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                        <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@ponderation" />
+                      </fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                        <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@l_Etat" />
+                      </fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                        <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@lib_mat_gros_mur" />
+                      </fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                        <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@lib_mat_toiture" />
+                      </fo:block>
+                    </fo:table-cell>
+
+                    <fo:table-cell>
+                      <fo:table table-layout="fixed" width="100%" border-separation="2">
+
+                        <fo:table-column column-width="45%" />
+                        <fo:table-column column-width="55%" />
+
+                        <fo:table-body>
+                          <xsl:if test="Mj_Pev/Mj_Depend_Descr/@nb_baignoires &gt; 0">
+                            <fo:table-row>
+                              <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                                <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                  <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@nb_baignoires" />
+                                </fo:block>
+                              </fo:table-cell>
+                              <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                                <fo:block text-align="left" vertical-align="middle" font-size="9pt">Baignoire(s)</fo:block>
+                              </fo:table-cell>
+                            </fo:table-row>
+                          </xsl:if>
+                          <xsl:if test="Mj_Pev/Mj_Depend_Descr/@nb_douches &gt; 0">
+                            <fo:table-row>
+                              <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                                <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                  <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@nb_douches" />
+                                </fo:block>
+                              </fo:table-cell>
+                              <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                                <fo:block text-align="left" vertical-align="middle" font-size="9pt">Douche(s)</fo:block>
+                              </fo:table-cell>
+                            </fo:table-row>
+                          </xsl:if>
+                          <xsl:if test="Mj_Pev/Mj_Depend_Descr/@nb_lavabos &gt; 0">
+                            <fo:table-row>
+                              <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                                <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                  <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@nb_lavabos" />
+                                </fo:block>
+                              </fo:table-cell>
+                              <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                                <fo:block text-align="left" vertical-align="middle" font-size="9pt">Lavabo(s)</fo:block>
+                              </fo:table-cell>
+                            </fo:table-row>
+                          </xsl:if>
+                          <xsl:if test="Mj_Pev/Mj_Depend_Descr/@nb_wc &gt; 0">
+                            <fo:table-row>
+                              <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                                <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                  <xsl:value-of select="Mj_Pev/Mj_Depend_Descr/@nb_wc" />
+                                </fo:block>
+                              </fo:table-cell>
+                              <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                                <fo:block text-align="left" vertical-align="middle" font-size="9pt">W.C.</fo:block>
+                              </fo:table-cell>
+                            </fo:table-row>
+                          </xsl:if>
+                          <fo:table-row>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">Eau :</fo:block>
+                            </fo:table-cell>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:if test ="Mj_Pev/Mj_Depend_Descr/@eau = 'EAU'">
+                                  Oui
+                                </xsl:if>
+                              </fo:block>
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:if test ="Mj_Pev/Mj_Depend_Descr/@eau = ''">
+                                  -
+                                </xsl:if>
+                              </fo:block>
+                            </fo:table-cell>
+                          </fo:table-row>
+                          <fo:table-row>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">Chauffage :</fo:block>
+                            </fo:table-cell>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:if test ="Mj_Pev/Mj_Depend_Descr/@chauf = 'CHAUF'">
+                                  Oui
+                                </xsl:if>
+                              </fo:block>
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:if test ="Mj_Pev/Mj_Depend_Descr/@chauf = ''">
+                                  -
+                                </xsl:if>
+                              </fo:block>
+                            </fo:table-cell>
+                          </fo:table-row>
+                          <fo:table-row>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">Electricité :</fo:block>
+                            </fo:table-cell>
+                            <fo:table-cell background-color="#F7F7F7" text-align ="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:if test ="Mj_Pev/Mj_Depend_Descr/@elect = 'ELECT'">
+                                  Oui
+                                </xsl:if>
+                              </fo:block>
+                              <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                                <xsl:if test ="Mj_Pev/Mj_Depend_Descr/@elect = ''">
+                                  -
+                                </xsl:if>
+                              </fo:block>
+                            </fo:table-cell>
+                          </fo:table-row>
+                        </fo:table-body>
+                      </fo:table>
+                    </fo:table-cell>
+                  </fo:table-row>
+                </fo:table-body>
+              </fo:table>
+            </xsl:if>
+            <xsl:if test ="Mj_Pev/Mj_Prof_Descr[@num_pev]">
+              <fo:block color="#F1B4B4">
+                <fo:leader leader-length="100%" leader-pattern="rule"/>
+              </fo:block>
+              <fo:block text-align="left" vertical-align="middle" font-size="13pt" color="#990000">
+                Locaux Professionnels
+              </fo:block>
+              <fo:table margin-bottom="35px" table-layout="fixed" width="100%" border-separation="2">
+
+                <fo:table-column column-width="15%" />
+                <fo:table-column column-width="85%" />
+
+                <fo:table-body>
+                  <fo:table-row>
+                    <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">N°</fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">Surface (m²)</fo:block>
+                    </fo:table-cell>
+                  </fo:table-row>
+                  <fo:table-row>
+                    <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                        <xsl:value-of select="Mj_Pev/Mj_Prof_Descr/@num_pev" />
+                      </fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                        <xsl:value-of select="Mj_Pev/Mj_Prof_Descr/@surface" />
+                      </fo:block>
+                    </fo:table-cell>
+                  </fo:table-row>
+                </fo:table-body>
+              </fo:table>
+            </xsl:if>
+          </xsl:for-each>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </xsl:template>
+</xsl:stylesheet>
+
+
diff --git a/src/module_cadastreV2/web_service/class/majic_libV2/xsl/FP_fo_Restreint.xsl b/src/module_cadastreV2/web_service/class/majic_libV2/xsl/FP_fo_Restreint.xsl
new file mode 100755
index 0000000000000000000000000000000000000000..a4ad0ace046dd98b69f2d2115e6839141bbd31ef
--- /dev/null
+++ b/src/module_cadastreV2/web_service/class/majic_libV2/xsl/FP_fo_Restreint.xsl
@@ -0,0 +1,593 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  <xsl:template match="/">
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="simple" page-width="21cm" page-height="29.7cm" margin-top="0.5cm" margin-bottom="0.5cm" margin-left="0.5cm" margin-right="0.5cm">
+          <fo:region-body margin-top="0cm" margin-bottom="0cm" margin-left="0.5cm" margin-right="0.5cm" />
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+
+      <fo:page-sequence master-reference="simple" font-family="Times">
+        <!-- Tableau global bas� sur la structure de la premi�re ligne du relev� de propri�t� -->
+        <fo:flow flow-name="xsl-region-body">
+
+          <fo:block >
+            <fo:external-graphic >
+              <xsl:attribute name="src">
+                file:///C:\serveurs\Apache2\htdocs\rgd\images\bandeau.jpg
+              </xsl:attribute>
+            </fo:external-graphic>
+          </fo:block>
+
+          <fo:block color="#F1B4B4">
+            <fo:leader leader-length="100%" leader-pattern="rule"/>
+          </fo:block>
+          <fo:block text-align="left" vertical-align="middle" font-size="19pt" color="#008393">
+            <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle">
+              Parcelle <xsl:value-of select="@section" /><xsl:value-of select="format-number(@num_parc, '0000')"/> 
+            </xsl:for-each>
+          </fo:block>
+          <fo:block color="#F1B4B4">
+            <fo:leader leader-length="100%" leader-pattern="rule"/>
+          </fo:block>
+          <fo:table margin-bottom="35px" table-layout="fixed" width="100%" border-separation="2" >
+            <fo:table-column column-width="17%" />
+            <fo:table-column column-width="83%" />
+            <fo:table-body>
+              <fo:table-row>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Adresse :</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#F7F7F7" text-align="left"  padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@num_voirie" />
+                      <xsl:value-of select="@adresse" />
+                    </fo:block>
+                  </xsl:for-each>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Commune :</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#F7F7F7" text-align="left"  padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@libcom" />
+                    </fo:block>
+                  </xsl:for-each>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Code Commune (Insee) :</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#F7F7F7" text-align="left"  padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@codeinsee" />
+                    </fo:block>
+                  </xsl:for-each>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Cpte Propri�taire :</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#F7F7F7" text-align="left"  padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="Mj_Parcelle/@dnupro" />
+                    </fo:block>
+                    <!-- retour chariot -->
+                  </xsl:for-each>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Surface cadastrale (m�) :</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#F7F7F7" text-align="left"  padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@total_contenance_m2" />
+                    </fo:block>
+                  </xsl:for-each>
+                </fo:table-cell>
+              </fo:table-row>
+            </fo:table-body>
+          </fo:table>
+
+          <!--<fo:block>
+            <fo:external-graphic>
+              <xsl:attribute name="src">
+                http://mapsrv.rgd74.fr/geomap70/mg/net/ggGetMapImage.aspx?USER=Administrator&amp;PWD=admin&amp;MAPNAME=Library://RISNET_GESTION/Cartes/RGD 73-74 - RISNET_GESTION_73_74.MapDefinition&amp;SELOBJS=PARCELLE%2C<xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle">
+                  <xsl:value-of select='substring(@idpar,1,2)'/>
+                  <xsl:value-of select='substring(@idpar,4,3)'/>
+                  <xsl:if test ="substring(@idpar,7,3)='000'">
+                    <xsl:text disable-output-escaping="yes">-.-.-</xsl:text>
+                  </xsl:if>
+                  <xsl:if test ="not(substring(@idpar,7,3)='000')">
+                    <xsl:value-of select='substring(@idpar,7,3)'/>
+                  </xsl:if>
+                  <xsl:if test ="substring(@idpar,10,1)='0'">
+                    <xsl:text disable-output-escaping="yes">-</xsl:text>
+                  </xsl:if>
+                  <xsl:if test ="not(substring(@idpar,10,1)='0')">
+                    <xsl:value-of select='substring(@idpar,10,1)'/>
+                  </xsl:if>
+                  <xsl:value-of select='substring(@idpar,11,1)'/>
+                  <xsl:value-of select='substring(@idpar,12)'/>
+                </xsl:for-each>-&amp;CENTERX=&amp;CENTERY=&amp;SCALE=*8&amp;HEIGHT=400&amp;WIDTH=575&amp;RESULTTYPE=JPG
+              </xsl:attribute>
+            </fo:external-graphic>
+          </fo:block>-->
+          <fo:block text-align="left" vertical-align="middle" font-size="13pt" color="#990000">
+            Urbanisme : POS/PLU
+          </fo:block>
+            
+          <fo:table margin-bottom="35px" table-layout="fixed" width="100%" border-separation="2">
+            <fo:table-column column-width="9%" />
+            <fo:table-column column-width="27.48%" />
+            <fo:table-column column-width="15.38%" />
+            <fo:table-column column-width="7.29%" />
+            <fo:table-column column-width="7.29%" />
+            <fo:table-column column-width="9.79%" />
+            <fo:table-column column-width="23.77%" />
+
+            <fo:table-body>
+              <fo:table-row>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Zonage</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Libell�</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Surface (m2)*</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">COS</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">CES</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Hauteur</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">R�glement de la zone</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+              <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle/Mj_PosPlu">
+                <fo:table-row>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@zonage" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@lib_zonage" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@surface" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@cos" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@ces" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@hauteur" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block color="blue" text-decoration="underline" text-align="left" vertical-align="middle" font-size="9pt">
+                      <fo:basic-link>
+                        <xsl:attribute name="external-destination">
+                          http://mapris.rgd74.fr/DocumentsPartenaires/Reglement_POS/ <xsl:value-of select="@idreg" />.pdf
+                        </xsl:attribute>Consulter le r�glement
+                      </fo:basic-link>
+                    </fo:block>
+                  </fo:table-cell>
+                </fo:table-row>
+              </xsl:for-each>
+            </fo:table-body>
+          </fo:table>
+          <fo:block text-align="left" vertical-align="middle" font-size="8pt">
+            *calcul sur la surface graphique, exclusion si surf &#139; 2 m�
+          </fo:block>
+          <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle/Mj_PosPlu">
+            <fo:block color="blue" text-decoration="underline" text-align="left" vertical-align="middle" font-size="9pt">
+              <fo:basic-link>
+                <xsl:attribute name="external-destination">
+                  http://mapris.rgd74.fr/Risnet_Gestion/Application/Rapport/etat_pos_plu/fiche_pos.asp?codcom=<xsl:value-of select="@codecom" />
+                </xsl:attribute>Avancement de l'actualisation/mise en ligne du POS/PLU de cette commune
+              </fo:basic-link>
+            </fo:block>
+          </xsl:for-each>
+
+          <fo:block color="#F1B4B4">
+            <fo:leader leader-length="100%" leader-pattern="rule"/>
+          </fo:block>
+          <fo:block text-align="left" vertical-align="middle" font-size="13pt" color="#990000">
+            Propri�taire(s) de la parcelle
+          </fo:block>
+          <fo:block text-align="left" vertical-align="middle" font-size="8pt">
+            *Cliquer sur le n� de compte pour acc�der � son relev� de propri�t�
+          </fo:block>
+          <fo:table margin-bottom="35px" table-layout="fixed" width="100%" border-separation="2">
+            <fo:table-column column-width="12.5%" />
+            <fo:table-column column-width="12.5%" />
+            <fo:table-column column-width="30%" />
+            <fo:table-column column-width="30%" />
+            <fo:table-column column-width="15%" />
+
+            <fo:table-body>
+              <fo:table-row>
+                <fo:table-cell number-columns-spanned="2" background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Compte</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Nom</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Adresse</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Type</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+              <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Proprietaire">
+                <fo:table-row>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block color="blue" text-decoration="underline" text-align="left" vertical-align="middle" font-size="9pt">
+                      <fo:basic-link>
+                        <xsl:attribute name="external-destination">
+                          http://localhost/rgd/rgdservices.phtml?operation=GetReleveprop&amp;compte=<xsl:value-of select="@dnupro"/>&amp;type=restreint&amp;format=pdf&amp;version=1.0
+                        </xsl:attribute>
+                        <xsl:value-of select="@dnupro" />
+                      </fo:basic-link>
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@proprietaire_nom_tiers" />
+                    </fo:block>
+                  </fo:table-cell>
+
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@proprietaire_adresse" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@l_ccodro" />
+                    </fo:block>
+                  </fo:table-cell>
+                </fo:table-row>
+                <xsl:if test ="..//Mj_Parcelle/Mj_Suf/Mj_Proprietaire[@dnupro]">
+                  <fo:table-row>
+                    <fo:table-cell number-columns-spanned="5" background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">D�tail</fo:block>
+                    </fo:table-cell>
+                  </fo:table-row>
+                  <fo:table-row>
+                    <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">Num�ro du lot</fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">Compte</fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">Nom</fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">Adresse</fo:block>
+                    </fo:table-cell>
+                    <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                      <fo:block text-align="left" vertical-align="middle" font-size="9pt">Type</fo:block>
+                    </fo:table-cell>
+                  </fo:table-row>
+                  <xsl:for-each select="../Mj_Parcelle/Mj_Suf/Mj_Proprietaire">
+                    <fo:table-row>
+                      <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                        <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                          <xsl:value-of select="../@dnulot" />
+                        </fo:block>
+                      </fo:table-cell>
+                      <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                        <fo:block color="blue" text-decoration="underline" text-align="left" vertical-align="middle" font-size="9pt">
+                          <fo:basic-link>
+                            <xsl:attribute name="external-destination">
+                              http://localhost/rgd/rgdservices.phtml?operation=GetReleveprop&amp;compte=<xsl:value-of select="@dnupro"/>&amp;type=restreint&amp;format=pdf&amp;version=1.0
+                            </xsl:attribute>
+                            <xsl:value-of select="@dnupro" />
+                          </fo:basic-link>
+                        </fo:block>
+                      </fo:table-cell>
+                      <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                        <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                          <xsl:value-of select="@proprietaire_nom" />
+                        </fo:block>
+                      </fo:table-cell>
+                      <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                        <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                          <xsl:value-of select="@proprietaire_adresse" />
+                        </fo:block>
+                      </fo:table-cell>
+                      <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                        <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                          <xsl:value-of select="@l_ccodro" />
+                        </fo:block>
+                      </fo:table-cell>
+                    </fo:table-row>
+                  </xsl:for-each>
+                </xsl:if>
+              </xsl:for-each>
+            </fo:table-body>
+          </fo:table>
+
+          <fo:block text-align="left" vertical-align="middle" font-size="13pt" color="#990000">
+            Subdivision(s) fiscale(s)
+          </fo:block>
+          <fo:table margin-bottom="35px" table-layout="fixed" width="100%" border-separation="2">
+
+            <fo:table-column column-width="12.4%" />
+            <fo:table-column column-width="12.4%" />
+            <fo:table-column column-width="12.4%" />
+            <fo:table-column column-width="12.6%" />
+            <fo:table-column column-width="12.4%" />
+            <fo:table-column column-width="12.6%" />
+            <fo:table-column column-width="12.6%" />
+            <fo:table-column column-width="12.6%" />
+
+            <fo:table-body>
+              <fo:table-row>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Lettre</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Groupe</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Nature</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Occupation</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Classe</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Compte</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Surface (m�)</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">R�f�rence</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+              <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle/Mj_Suf">
+                <fo:table-row>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:if test="not(@suf = '')">
+                        <xsl:value-of select="@suf" />
+                      </xsl:if>
+                      <xsl:if test="@suf = ''">
+                        -
+                      </xsl:if>
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:if test="not(@groupe = '')">
+                        <xsl:value-of select="@groupe" />
+                      </xsl:if>
+                      <xsl:if test="@groupe = ''">
+                        -
+                      </xsl:if>
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:if test="not(@nature = '')">
+                        <xsl:value-of select="@nature" />
+                      </xsl:if>
+                      <xsl:if test="@nature = ''">
+                        -
+                      </xsl:if>
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">-</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:if test="not(@clas = '')">
+                        <xsl:value-of select="@clas" />
+                      </xsl:if>
+                      <xsl:if test="@clas = ''">
+                        -
+                      </xsl:if>
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@dnupro" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@contenance_suf" />
+                    </fo:block>
+                  </fo:table-cell>
+
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@revenu_reference_txt" />
+                    </fo:block>
+                  </fo:table-cell>
+                </fo:table-row>
+              </xsl:for-each>
+            </fo:table-body>
+          </fo:table>
+
+          <xsl:if test="count(Mj/Mj_Compte_Communal_Parcelle/Mj_Bati) &gt; 0">
+            <fo:block color="#F1B4B4">
+              <fo:leader leader-length="100%" leader-pattern="rule"/>
+            </fo:block>
+            <fo:block text-align="left" vertical-align="middle" font-size="13pt" color="#990000">
+              El�ment(s) b�ti(s)
+            </fo:block>
+            <fo:table margin-bottom="35px" table-layout="fixed" width="100%" border-separation="2">
+
+              <fo:table-column column-width="15%" />
+              <fo:table-column column-width="15%" />
+              <fo:table-column column-width="15%" />
+              <fo:table-column column-width="55%" />
+
+              <fo:table-body>
+                <fo:table-row>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">Ref. local</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">Nature</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">Etages</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">Propri�taire(s)</fo:block>
+                  </fo:table-cell>
+                </fo:table-row>
+                <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Bati">
+                  <xsl:for-each select="Mj_Proprietaire">
+                    <fo:table-row>
+                      <xsl:if test="position()='1'">
+                        <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                          <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                            <xsl:value-of select="../@num_invar" />
+                          </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                          <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                            <xsl:value-of select="../@lib_nature" />
+                          </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                          <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                            <xsl:value-of select="../@niv" />
+                          </fo:block>
+                        </fo:table-cell>
+                      </xsl:if>
+                      <xsl:if test="position() &gt; '1'">
+                        <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                          <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                          </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                          <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                          </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                          <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                          </fo:block>
+                        </fo:table-cell>
+                      </xsl:if>
+                      <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                        <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                          <xsl:value-of select="@dnupro" />
+                        </fo:block>
+                      </fo:table-cell>
+                    </fo:table-row>
+                  </xsl:for-each>
+                </xsl:for-each>
+              </fo:table-body>
+            </fo:table>
+          </xsl:if>
+          <!-- .........................................Propri�taire de B�tis, mode Restreint................................................. -->
+          <fo:block color="#F1B4B4">
+            <fo:leader leader-length="100%" leader-pattern="rule"/>
+          </fo:block>
+          <fo:block text-align="left" vertical-align="middle" font-size="13pt" color="#990000">
+            Propri�taire(s) du local
+          </fo:block>
+
+          <fo:table margin-bottom="35px" table-layout="fixed" width="100%" border-separation="2" >
+            
+            <fo:table-column column-width="15%" />
+            <fo:table-column column-width="35%" />
+            <fo:table-column column-width="35%" />
+            <fo:table-column column-width="15%" />
+
+            <fo:table-body>
+              <fo:table-row>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Compte</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Nom</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Adresse</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Type</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+              <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Bati/Mj_Proprietaire">
+                <fo:table-row>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block color="blue" text-decoration="underline" text-align="left" vertical-align="middle" font-size="9pt">
+                      <fo:basic-link>
+                        <xsl:attribute name="external-destination">
+                          http://localhost/rgd/rgdservices.phtml?operation=GetReleveprop&amp;compte=<xsl:value-of select="@dnupro"/>&amp;type=restreint&amp;format=pdf&amp;version=1.0
+                        </xsl:attribute>
+                        <xsl:value-of select="@dnupro" />
+                      </fo:basic-link>
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@proprietaire_nom_tiers" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@proprietaire_adresse" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@l_ccodro" />
+                    </fo:block>
+                  </fo:table-cell>
+                </fo:table-row>
+              </xsl:for-each>
+            </fo:table-body>
+          </fo:table>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </xsl:template>
+</xsl:stylesheet>
+
+
diff --git a/src/module_cadastreV2/web_service/class/majic_libV2/xsl/FP_fo_SansNom.xsl b/src/module_cadastreV2/web_service/class/majic_libV2/xsl/FP_fo_SansNom.xsl
new file mode 100755
index 0000000000000000000000000000000000000000..59e985cc72f7919904c9c156725c4a94c03e1f15
--- /dev/null
+++ b/src/module_cadastreV2/web_service/class/majic_libV2/xsl/FP_fo_SansNom.xsl
@@ -0,0 +1,394 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  <xsl:template match="/">
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="simple" page-width="21cm" page-height="29.7cm" margin-top="0.5cm" margin-bottom="0.5cm" margin-left="0.5cm" margin-right="0.5cm">
+          <fo:region-body margin-top="0cm" margin-bottom="0cm" margin-left="0.5cm" margin-right="0.5cm" />
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+
+      <fo:page-sequence master-reference="simple" font-family="Times">
+        <!-- Tableau global bas� sur la structure de la premi�re ligne du relev� de propri�t� -->
+        <fo:flow flow-name="xsl-region-body">
+          
+          <fo:block >
+            <fo:external-graphic >
+              <xsl:attribute name="src">
+                file:///C:\serveurs\Apache2\htdocs\rgd\images\bandeau.jpg
+              </xsl:attribute>
+            </fo:external-graphic>
+          </fo:block>
+
+          <fo:block color="#F1B4B4">
+            <fo:leader leader-length="100%" leader-pattern="rule"/>
+          </fo:block>
+          <fo:block text-align="left" vertical-align="middle" font-size="17pt" color="#008393">
+            <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle">
+              Parcelle <xsl:value-of select="@section" /><xsl:value-of select="format-number(@num_parc, '0000')"/> 
+            </xsl:for-each>
+          </fo:block>
+          <fo:block color="#F1B4B4">
+            <fo:leader leader-length="100%" leader-pattern="rule"/>
+          </fo:block>
+          <fo:table margin-bottom="35px" table-layout="fixed" width="100%" border-separation="2" >
+            <fo:table-column column-width="17%" />
+            <fo:table-column column-width="83%" />
+            <fo:table-body>
+              <fo:table-row>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Adresse :</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#F7F7F7" text-align="left"  padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@num_voirie" />
+                      <xsl:value-of select="@adresse" />
+                    </fo:block>
+                  </xsl:for-each>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Commune :</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#F7F7F7" text-align="left"  padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@libcom" />
+                    </fo:block>
+                  </xsl:for-each>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Code Commune (Insee) :</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#F7F7F7" text-align="left"  padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@codeinsee" />
+                    </fo:block>
+                  </xsl:for-each>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Cpte Propri�taire :</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#F7F7F7" text-align="left"  padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="Mj_Parcelle/@dnupro" />
+                    </fo:block>
+                    <!-- retour chariot -->
+                  </xsl:for-each>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Surface cadastrale (m�) :</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#F7F7F7" text-align="left"  padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@total_contenance_m2" />
+                    </fo:block>
+                  </xsl:for-each>
+                </fo:table-cell>
+              </fo:table-row>
+
+              <fo:table-row>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Urbaine :</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#F7F7F7" text-align="left"  padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@gurbpa" />
+                    </fo:block>
+                  </xsl:for-each>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">B�tie :</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#F7F7F7" text-align="left"  padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@gparbat" />
+                    </fo:block>
+                  </xsl:for-each>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Parcelle primitive :</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#F7F7F7" text-align="left"  padding-left="5" padding-top="5" padding-bottom="5" padding-right="5" >
+                  <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:if test="not(@num_parc_prim = '')">
+                        <xsl:value-of select="@num_parc_prim" />
+                      </xsl:if>
+                      <xsl:if test="@num_parc_prim = ''">
+                        -
+                      </xsl:if>
+                    </fo:block>
+                  </xsl:for-each>
+                </fo:table-cell>
+              </fo:table-row>
+            </fo:table-body>
+          </fo:table>
+
+          <!--<fo:block>
+            <fo:external-graphic>
+              <xsl:attribute name="src">
+                http://mapsrv.rgd74.fr/geomap70/mg/net/ggGetMapImage.aspx?USER=Administrator&amp;PWD=admin&amp;MAPNAME=Library://RISNET_GESTION/Cartes/RGD 73-74 - RISNET_GESTION_73_74.MapDefinition&amp;SELOBJS=PARCELLE%2C<xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle">
+                  <xsl:value-of select='substring(@idpar,1,2)'/>
+                  <xsl:value-of select='substring(@idpar,4,3)'/>
+                  <xsl:if test ="substring(@idpar,7,3)='000'">
+                    <xsl:text disable-output-escaping="yes">-.-.-</xsl:text>
+                  </xsl:if>
+                  <xsl:if test ="not(substring(@idpar,7,3)='000')">
+                    <xsl:value-of select='substring(@idpar,7,3)'/>
+                  </xsl:if>
+                  <xsl:if test ="substring(@idpar,10,1)='0'">
+                    <xsl:text disable-output-escaping="yes">-</xsl:text>
+                  </xsl:if>
+                  <xsl:if test ="not(substring(@idpar,10,1)='0')">
+                    <xsl:value-of select='substring(@idpar,10,1)'/>
+                  </xsl:if>
+                  <xsl:value-of select='substring(@idpar,11,1)'/>
+                  <xsl:value-of select='substring(@idpar,12)'/>
+                </xsl:for-each>-&amp;CENTERX=&amp;CENTERY=&amp;SCALE=*8&amp;HEIGHT=400&amp;WIDTH=575&amp;RESULTTYPE=JPG
+              </xsl:attribute>
+            </fo:external-graphic>
+          </fo:block>-->
+          <fo:block text-align="left" vertical-align="middle" font-size="13pt" color="#990000">
+            Urbanisme : POS/PLU
+          </fo:block>
+            
+          <fo:table margin-bottom="35px" table-layout="fixed" width="100%" border-separation="2">
+            <fo:table-column column-width="9%" />
+            <fo:table-column column-width="27.48%" />
+            <fo:table-column column-width="15.38%" />
+            <fo:table-column column-width="7.29%" />
+            <fo:table-column column-width="7.29%" />
+            <fo:table-column column-width="9.79%" />
+            <fo:table-column column-width="23.77%" />
+
+            <fo:table-body>
+              <fo:table-row>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Zonage</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Libell�</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Surface (m2)*</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">COS</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">CES</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Hauteur</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">R�glement de la zone</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+              <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle/Mj_PosPlu">
+                <fo:table-row>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@zonage" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@lib_zonage" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@surface" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@cos" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@ces" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@hauteur" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block color="blue" text-decoration="underline" text-align="left" vertical-align="middle" font-size="9pt">
+                      <fo:basic-link>
+                        <xsl:attribute name="external-destination">
+                          http://mapris.rgd74.fr/DocumentsPartenaires/Reglement_POS/ <xsl:value-of select="@idreg" />.pdf
+                        </xsl:attribute>Consulter le r�glement
+                      </fo:basic-link>
+                    </fo:block>
+                  </fo:table-cell>
+                </fo:table-row>
+              </xsl:for-each>
+            </fo:table-body>
+          </fo:table>
+          <fo:block text-align="left" vertical-align="middle" font-size="8pt">
+            *calcul sur la surface graphique, exclusion si surf &#139; 2 m�
+          </fo:block>
+          <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle/Mj_PosPlu">
+            <fo:block color="blue" text-decoration="underline" text-align="left" vertical-align="middle" font-size="9pt">
+              <fo:basic-link>
+                <xsl:attribute name="external-destination">
+                  http://mapris.rgd74.fr/Risnet_Gestion/Application/Rapport/etat_pos_plu/fiche_pos.asp?codcom=<xsl:value-of select="@codecom" />
+                </xsl:attribute>Avancement de l'actualisation/mise en ligne du POS/PLU de cette commune
+              </fo:basic-link>
+            </fo:block>
+          </xsl:for-each>
+		  
+          <fo:block color="#F1B4B4">
+            <fo:leader leader-length="100%" leader-pattern="rule"/>
+          </fo:block>
+          
+          <fo:block text-align="left" vertical-align="middle" font-size="13pt" color="#990000">
+            Subdivision(s) fiscale(s)
+          </fo:block>
+          <fo:table margin-bottom="35px" table-layout="fixed" width="100%" border-separation="2">
+
+            <fo:table-column column-width="11%" />
+            <fo:table-column column-width="11%" />
+            <fo:table-column column-width="11%" />
+            <fo:table-column column-width="11.2%" />
+            <fo:table-column column-width="11%" />
+            <fo:table-column column-width="11.2%" />
+            <fo:table-column column-width="11.2%" />
+            <fo:table-column column-width="11.2%" />
+            <fo:table-column column-width="11.2%" />
+
+            <fo:table-body>
+              <fo:table-row>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Lettre</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Groupe</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Nature</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Occupation</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Classe</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Compte</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Surface (m�)</fo:block>
+                </fo:table-cell>
+
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">Revenu (?)</fo:block>
+                </fo:table-cell>
+
+                <fo:table-cell background-color="#eeeeee" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                  <fo:block text-align="left" vertical-align="middle" font-size="9pt">R�f�rence</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+              <xsl:for-each select="Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle/Mj_Suf">
+                <fo:table-row>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:if test="not(@suf = '')">
+                        <xsl:value-of select="@suf" />
+                      </xsl:if>
+                      <xsl:if test="@suf = ''">
+                        -
+                      </xsl:if>
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:if test="not(@groupe = '')">
+                        <xsl:value-of select="@groupe" />
+                      </xsl:if>
+                      <xsl:if test="@groupe = ''">
+                        -
+                      </xsl:if>
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:if test="not(@nature = '')">
+                        <xsl:value-of select="@nature" />
+                      </xsl:if>
+                      <xsl:if test="@nature = ''">
+                        -
+                      </xsl:if>
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">-</fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:if test="not(@clas = '')">
+                        <xsl:value-of select="@clas" />
+                      </xsl:if>
+                      <xsl:if test="@clas = ''">
+                        -
+                      </xsl:if>
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@dnupro" />
+                    </fo:block>
+                  </fo:table-cell>
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@contenance_suf" />
+                    </fo:block>
+                  </fo:table-cell>
+
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@revenu_cadastral_txt" />
+                    </fo:block>
+                  </fo:table-cell>
+
+                  <fo:table-cell background-color="#F7F7F7" text-align="left" padding-left="5" padding-top="5" padding-bottom="5" padding-right="5">
+                    <fo:block text-align="left" vertical-align="middle" font-size="9pt">
+                      <xsl:value-of select="@revenu_reference_txt" />
+                    </fo:block>
+                  </fo:table-cell>
+                </fo:table-row>
+              </xsl:for-each>
+            </fo:table-body>
+          </fo:table>
+          
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </xsl:template>
+</xsl:stylesheet>
+
+
diff --git a/src/module_cadastreV2/web_service/class/majic_libV2/xsl/Mj_Rapport.xsl b/src/module_cadastreV2/web_service/class/majic_libV2/xsl/Mj_Rapport.xsl
new file mode 100755
index 0000000000000000000000000000000000000000..0df5da5c1adf6611a593f3597bd5a88159fc42f1
--- /dev/null
+++ b/src/module_cadastreV2/web_service/class/majic_libV2/xsl/Mj_Rapport.xsl
@@ -0,0 +1,303 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+<xsl:template match="Rapport_Parcelle">
+	<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+		<fo:layout-master-set>
+			<fo:simple-page-master master-name="simple" page-height="29.7cm" page-width="21cm" margin-top="0.5cm" margin-bottom="0.5cm" margin-left="0.2cm" margin-right="0.2cm">
+				<fo:region-body region-name="Content" margin="0.2cm 0.2cm 0.2cm 0.2cm"></fo:region-body>
+				<fo:region-after region-name="Footer" extent="0.5in"></fo:region-after>
+			</fo:simple-page-master>
+		</fo:layout-master-set>
+	<fo:page-sequence master-reference="simple" font-family="Helvetica">
+
+	<!-- Début du pied de page qui se retrouvera sur chaque page -->
+		<fo:static-content flow-name="Footer">
+			<fo:block text-align="right" font-size="6pt">
+				Page <fo:page-number />
+			</fo:block>
+
+			<fo:block text-align="right" font-size="6pt">
+				<xsl:value-of select="Mj_Compte_Communal_Parcelles/Mj_Compte_Communal_Parcelle/Mj_Parcelle/@dateheure" />
+			</fo:block>
+		</fo:static-content>
+	<!-- Fin du pied de page -->
+
+	<fo:flow flow-name="Content">
+
+	<fo:block>
+
+	<!-- Création du contenu de la page pour chaque Mj_Compte_Communal_Parcelle trouvé -->
+
+	<xsl:for-each select="Mj_Compte_Communal_Parcelles">
+
+	<fo:table table-layout="fixed" border-collapse="collapse">
+	<fo:table-body>
+		<fo:table-row height="4cm">
+			<!--fo:table-cell><fo:block><fo:external-graphic src="C:/serveurs/Apache2/htdocs/lib/majic_lib/pics_for_xsl/blason.bmp" content-height="2.5cm"/></fo:block></fo:table-cell-->
+			<fo:table-cell><fo:block  font-weight="bold" text-align="center" font-size="14pt">Rapport de parcelles</fo:block></fo:table-cell>
+		</fo:table-row>
+	</fo:table-body>
+	</fo:table>
+	<xsl:for-each select="./Mj_Compte_Communal_Parcelle">
+	<fo:block border-color="black" border-style="double" border-width="1pt">
+
+	<fo:table table-layout="fixed" width="100%" border-collapse="collapse" font-size="10pt">
+
+	<fo:table-body>
+
+		<!-- Tableau d'affichage des informations de la parcelle -->
+		<fo:table-row height="1cm">
+			<fo:table-cell><fo:block font-weight="bold">PARCELLE</fo:block></fo:table-cell>
+			<fo:table-cell><fo:block><xsl:value-of select="./Mj_Parcelle/@idpar" /></fo:block></fo:table-cell>
+		</fo:table-row>
+		<fo:table-row>
+			<fo:table-cell><fo:block>Adresse</fo:block></fo:table-cell>
+			<fo:table-cell>
+				<xsl:if test="normalize-space(./Mj_Parcelle/@num_voirie) != '' ">
+					<fo:block><xsl:value-of select="./Mj_Parcelle/@num_voirie" />, </fo:block>
+				</xsl:if>
+				<fo:block> <xsl:value-of select="./Mj_Parcelle/@adresse" />, </fo:block>
+				<fo:block> <xsl:value-of select="@libcom" /></fo:block>
+			</fo:table-cell>
+		</fo:table-row>
+		<fo:table-row>
+			<fo:table-cell><fo:block>Surface cadastrale</fo:block></fo:table-cell>
+			<fo:table-cell><fo:block><xsl:value-of select="./Mj_Parcelle/@contenance" /> m²</fo:block></fo:table-cell>
+		</fo:table-row>
+		<fo:table-row>
+			<fo:table-cell><fo:block>Emprise batie</fo:block></fo:table-cell>
+			<fo:table-cell>
+				<xsl:if test="./Mj_Parcelle/Mj_Emprises/@titre = 'Emprise Bati' ">
+					<xsl:if test="./Mj_Parcelle/Mj_Emprises[@titre='Emprise Bati']/@emprise_totale_intersect != '' ">
+						<fo:block><xsl:value-of select="./Mj_Parcelle/Mj_Emprises[@titre='Emprise Bati']/@emprise_totale_intersect" /> m² = <xsl:value-of select="./Mj_Parcelle/Mj_Emprises[@titre='Emprise Bati']/@emprise_totale_ratio" /> % </fo:block>
+					</xsl:if>
+				</xsl:if>
+				<fo:block></fo:block>
+			</fo:table-cell>
+		</fo:table-row>
+		<fo:table-row>
+			<fo:table-cell><fo:block>Emprise non-batie</fo:block></fo:table-cell>
+			<fo:table-cell>
+				<xsl:if test="./Mj_Parcelle/Mj_Emprises/@titre = 'Emprise Bati' ">
+					<xsl:if test="./Mj_Parcelle/Mj_Emprises[@titre='Emprise Bati']/@emprise_totale_intersect != '' ">
+						<fo:block>
+						<xsl:variable name="surf_parcelle" select="./Mj_Parcelle/@contenance"/>
+						<xsl:variable name="surf_emprisebati" select="./Mj_Parcelle/Mj_Emprises[@titre='Emprise Bati']/@emprise_totale_intersect"/>
+						<xsl:variable name="res" select="round((($surf_parcelle - $surf_emprisebati)*100))*0.01"/>
+
+						<xsl:variable name="ratio_emprisebati" select="./Mj_Parcelle/Mj_Emprises[@titre='Emprise Bati']/@emprise_totale_ratio"/>
+						<xsl:variable name="resratio" select="100 - $ratio_emprisebati"/>
+
+						<xsl:value-of select="$res" /> m² = <xsl:value-of select="$resratio" /> %</fo:block>
+					</xsl:if>
+				</xsl:if>
+				<fo:block></fo:block>
+			</fo:table-cell>
+		</fo:table-row>
+		<fo:table-row height="1cm">
+			<fo:table-cell><fo:block>Compte propriétaire</fo:block></fo:table-cell>
+			<fo:table-cell><fo:block><xsl:value-of select="./Mj_Parcelle/@dnupro" /></fo:block></fo:table-cell>
+		</fo:table-row>
+
+		<!-- Tableau d'affichage des propriétaires de la parcelle -->
+		<fo:table-row height="1cm">
+			<fo:table-cell><fo:block font-weight="bold">PROPRIÉTAIRE</fo:block></fo:table-cell>
+			<fo:table-cell><fo:block></fo:block></fo:table-cell>
+		</fo:table-row>
+		<xsl:for-each select="./Mj_Proprietaire">
+			<fo:table-row>
+				<fo:table-cell><fo:block>Nom</fo:block></fo:table-cell>
+				<fo:table-cell><fo:block><xsl:value-of select="@proprietaire_nom" /></fo:block></fo:table-cell>
+			</fo:table-row>
+			<fo:table-row height="1cm">
+				<fo:table-cell><fo:block>Adresse</fo:block></fo:table-cell>
+				<fo:table-cell><fo:block><xsl:value-of select="@proprietaire_adresse" /></fo:block></fo:table-cell>
+			</fo:table-row>
+		</xsl:for-each>
+
+		<!-- Tableau d'affichage des informations de la subdi. fiscale de la parcelle -->
+		<fo:table-row height="1cm">
+			<fo:table-cell><fo:block font-weight="bold">SUBDIVISION FISCALE</fo:block></fo:table-cell>
+			<fo:table-cell><fo:block></fo:block></fo:table-cell>
+		</fo:table-row>
+		<fo:table-row>
+			<fo:table-cell><fo:block>Revenu</fo:block></fo:table-cell>
+			<fo:table-cell><fo:block><xsl:value-of select="./Mj_Parcelle/@revenu_cadastral" /> &#x20AC;</fo:block></fo:table-cell>
+		</fo:table-row>
+		<fo:table-row>
+			<fo:table-cell><fo:block>Surface</fo:block></fo:table-cell>
+			<fo:table-cell><fo:block><xsl:value-of select="./Mj_Parcelle/@contenance" /> m²</fo:block></fo:table-cell>
+		</fo:table-row>
+		<fo:table-row height="1cm">
+			<fo:table-cell><fo:block>Occupation</fo:block></fo:table-cell>
+			<fo:table-cell><fo:block><xsl:value-of select="./Mj_Parcelle/@grss_gr" /></fo:block></fo:table-cell>
+		</fo:table-row>
+
+		<!-- Tableau d'affichage des emprises de la parcelle -->
+		<fo:table-row height="1cm">
+			<fo:table-cell><fo:block font-weight="bold">EMPRISES</fo:block></fo:table-cell>
+			<fo:table-cell><fo:block></fo:block></fo:table-cell>
+		</fo:table-row>
+
+		<xsl:for-each select="./Mj_Parcelle/Mj_Emprises">
+			<xsl:if test="./@emprise_totale_intersect != 0 ">
+				<fo:table-row>
+					<fo:table-cell>
+						<fo:block><xsl:value-of select="./@titre" /></fo:block>
+					</fo:table-cell>
+					<fo:table-cell><fo:block></fo:block></fo:table-cell>
+				</fo:table-row>
+				<xsl:for-each select="./Mj_Emprise">
+					<fo:table-row>
+						<fo:table-cell><fo:block></fo:block></fo:table-cell>
+						<fo:table-cell>
+							<fo:block>
+								Pourcentage de la parcelle intersectée : <xsl:value-of select="./@emprise_ratio_label" />
+							</fo:block>
+						</fo:table-cell>
+					</fo:table-row>
+					<xsl:for-each select="./Mj_Attributes/Mj_Attribute">
+						<xsl:if test="./@title != '' ">
+							<fo:table-row>
+								<fo:table-cell><fo:block></fo:block></fo:table-cell>
+								<fo:table-cell>
+									<fo:block>
+										<xsl:value-of select="./@title" /> : <xsl:value-of select="./@value" />
+										<xsl:if test="./@label = 'intersect' "> m² </xsl:if>
+									</fo:block>
+								</fo:table-cell>
+							</fo:table-row>
+						</xsl:if>
+					</xsl:for-each>
+					<fo:table-row height="0.5cm">
+						<fo:table-cell><fo:block></fo:block></fo:table-cell>
+					</fo:table-row>
+				</xsl:for-each>
+			</xsl:if>
+		</xsl:for-each>
+
+		<fo:table-row height="1cm">
+			<fo:table-cell><fo:block></fo:block></fo:table-cell>
+		</fo:table-row>
+
+		<!-- Tableau d'affichage des locaux de la parcelle -->
+		<fo:table-row height="1cm">
+			<fo:table-cell><fo:block font-weight="bold">LOCAL</fo:block></fo:table-cell>
+			<fo:table-cell><fo:block></fo:block></fo:table-cell>
+		</fo:table-row>
+
+		<xsl:for-each select="./Mj_Bati">
+
+			<fo:table-row>
+				<fo:table-cell><fo:block>Adresse</fo:block></fo:table-cell>
+				<fo:table-cell><fo:block>Batiment <xsl:value-of select="@bat" />,Etage <xsl:value-of select="@niv" />,Porte <xsl:value-of select="@num_de_porte" />,<xsl:value-of select="voirie" />,<xsl:value-of select="@adresse" /></fo:block></fo:table-cell>
+			</fo:table-row>
+			<fo:table-row>
+				<fo:table-cell><fo:block>Type de local</fo:block></fo:table-cell>
+				<fo:table-cell><fo:block><xsl:value-of select="@nat_loc" /></fo:block></fo:table-cell>
+			</fo:table-row>
+			<fo:table-row>
+				<fo:table-cell><fo:block>Valeur locative</fo:block></fo:table-cell>
+				<fo:table-cell><fo:block><xsl:value-of select="@dvlpera" /> &#x20AC;</fo:block></fo:table-cell>
+			</fo:table-row>
+			<fo:table-row>
+				<fo:table-cell><fo:block>Millièmes et lots</fo:block></fo:table-cell>
+				<fo:table-cell><fo:block></fo:block></fo:table-cell>
+			</fo:table-row>
+			<fo:table-row height="1cm">
+				<fo:table-cell><fo:block>Compte propriétaire</fo:block></fo:table-cell>
+				<fo:table-cell><fo:block><xsl:value-of select="@b_dnupro" /></fo:block></fo:table-cell>
+			</fo:table-row>
+
+			<!-- affichage en tableau des propriétaires des locaux -->
+			<xsl:for-each select="./Mj_Proprietaire">
+				<fo:table-row>
+					<fo:table-cell>
+						<fo:table>
+						<fo:table-body>
+							<fo:table-row height="1.5cm">
+								<fo:table-cell width="2cm"><fo:block></fo:block></fo:table-cell>
+								<fo:table-cell width="5cm" font-size="9pt"><fo:block>Propriétaire local</fo:block></fo:table-cell>
+								<fo:table-cell width="13cm" font-size="9pt"><fo:block><xsl:value-of select="@proprietaire_nom" /> ; <xsl:value-of select="@proprietaire_adresse" /></fo:block></fo:table-cell>
+							</fo:table-row>
+						</fo:table-body>
+						</fo:table>
+					</fo:table-cell>
+				</fo:table-row>
+			</xsl:for-each>
+
+		</xsl:for-each>
+
+
+	</fo:table-body>
+
+	</fo:table>
+
+	</fo:block>
+
+	<!-- permet de sauter une page -->
+	<fo:block break-after="page"/>
+
+	</xsl:for-each>
+
+	<fo:block>
+		<fo:table>
+			<fo:table-body>
+				<fo:table-row height="1.5cm">
+					<fo:table-cell width="2cm"><fo:block></fo:block></fo:table-cell>
+					<fo:table-cell width="5cm" font-size="9pt"><fo:block font-weight="bold" >Totaux</fo:block></fo:table-cell>
+				</fo:table-row>
+			</fo:table-body>
+		</fo:table>
+	</fo:block>
+
+	<fo:block>
+		<fo:table>
+			<fo:table-body>
+				<fo:table-row height="1.5cm">
+					<fo:table-cell width="2cm"><fo:block></fo:block></fo:table-cell>
+					<fo:table-cell width="5cm" font-size="9pt"><fo:block>Surface cadastrale</fo:block></fo:table-cell>
+					<fo:table-cell width="13cm" font-size="9pt"><fo:block><xsl:value-of select="@Sum_contenance" /> m²</fo:block></fo:table-cell>
+				</fo:table-row>
+			</fo:table-body>
+		</fo:table>
+	</fo:block>
+
+	<fo:block>
+		<fo:table>
+			<fo:table-body>
+				<fo:table-row height="1.5cm">
+					<fo:table-cell width="2cm"><fo:block></fo:block></fo:table-cell>
+					<fo:table-cell width="5cm" font-size="9pt"><fo:block>Revenu</fo:block></fo:table-cell>
+					<fo:table-cell width="13cm" font-size="9pt"><fo:block><xsl:value-of select="@Sum_revenu" /> &#x20AC;</fo:block></fo:table-cell>
+				</fo:table-row>
+			</fo:table-body>
+		</fo:table>
+	</fo:block>
+
+	<fo:block>
+		<fo:table>
+			<fo:table-body>
+				<fo:table-row height="1.5cm">
+					<fo:table-cell width="2cm"><fo:block></fo:block></fo:table-cell>
+					<fo:table-cell width="5cm" font-size="9pt"><fo:block>Valeur locative</fo:block></fo:table-cell>
+					<fo:table-cell width="13cm" font-size="9pt"><fo:block><xsl:value-of select="@Sum_valeur_locative" /> &#x20AC;</fo:block></fo:table-cell>
+				</fo:table-row>
+			</fo:table-body>
+		</fo:table>
+	</fo:block>
+
+	</xsl:for-each>
+
+	</fo:block>
+
+	</fo:flow>
+
+	</fo:page-sequence>
+
+	</fo:root>
+
+</xsl:template>
+
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/src/module_cadastreV2/web_service/class/majic_libV2/xsl/Mj_Rapport_Parcelle_BatieNonBatie.xsl b/src/module_cadastreV2/web_service/class/majic_libV2/xsl/Mj_Rapport_Parcelle_BatieNonBatie.xsl
new file mode 100755
index 0000000000000000000000000000000000000000..5d44af1556e5a5a46e04df19b8766142ea21ebff
--- /dev/null
+++ b/src/module_cadastreV2/web_service/class/majic_libV2/xsl/Mj_Rapport_Parcelle_BatieNonBatie.xsl
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding='utf-8' ?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:output method="xml" indent="yes"/>
+<xsl:template match="Rapport_Parcelle">
+<?mso-application progid="Excel.Sheet"?>
+	<Workbook xmlns="urn:schemas-microsoft-com:office:spreadsheet"
+		xmlns:o="urn:schemas-microsoft-com:office:office"
+		xmlns:x="urn:schemas-microsoft-com:office:excel"
+		xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet"
+		xmlns:html="http://www.w3.org/TR/REC-html40">
+		<DocumentProperties xmlns="urn:schemas-microsoft-com:office:office">
+			<Author>Veremap.pro</Author>
+			<LastAuthor>Veremap.pro</LastAuthor>
+			<Company>Veremes</Company>
+		</DocumentProperties>
+		<ExcelWorkbook xmlns="urn:schemas-microsoft-com:office:excel">
+			<WindowHeight>12300</WindowHeight>
+			<WindowWidth>18915</WindowWidth>
+			<WindowTopX>120</WindowTopX>
+			<WindowTopY>105</WindowTopY>
+			<ProtectStructure>False</ProtectStructure>
+			<ProtectWindows>False</ProtectWindows>
+		</ExcelWorkbook>
+		<Styles>
+			<Style ss:ID="Default" ss:Name="Normal">
+				<Alignment ss:Vertical="Bottom"/>
+				<Borders/>
+				<Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="11" ss:Color="#000000"/>
+				<Interior/>
+				<NumberFormat/>
+				<Protection/>
+			</Style>
+
+			<Style	ss:ID="s63">
+				<Alignment	ss:Horizontal="Center"	ss:Vertical="Bottom"/>
+				<Borders>
+					<Border	ss:Position="Bottom"	ss:LineStyle="Continuous"	ss:Weight="2"/>
+					<Border	ss:Position="Left"	ss:LineStyle="Continuous"	ss:Weight="2"/>
+					<Border	ss:Position="Top"	ss:LineStyle="Continuous"	ss:Weight="2"/>
+				</Borders>
+			</Style>
+			<Style	ss:ID="s64">
+				<Alignment	ss:Horizontal="Center"	ss:Vertical="Bottom"/>
+				<Borders>
+					<Border	ss:Position="Bottom"	ss:LineStyle="Continuous"	ss:Weight="2"/>
+					<Border	ss:Position="Left"	ss:LineStyle="Continuous"	ss:Weight="2"/>
+					<Border	ss:Position="Right"	ss:LineStyle="Continuous"	ss:Weight="2"/>
+					<Border	ss:Position="Top"	ss:LineStyle="Continuous"	ss:Weight="2"/>
+				</Borders>
+			</Style>
+			<Style	ss:ID="s65">
+				<Alignment	ss:Horizontal="Center"	ss:Vertical="Bottom"/>
+			</Style>
+
+		</Styles>
+		 <Worksheet ss:Name="Feuil1">
+			<!--<xsl:variable name="nb_ligne"><xsl:value-of select="./XmlMapLog/XmlLog/@nb_ligne" /></xsl:variable>-->
+			<Table ss:DefaultColumnWidth="60" ss:DefaultRowHeight="15">
+				<!--<xsl:attribute name="ss:ExpandedRowCount"><xsl:value-of select="1000" /></xsl:attribute>-->
+				<Column ss:AutoFitWidth="0" ss:Width="103.5"/>
+				<Column ss:AutoFitWidth="0" ss:Width="105"/>
+				<Column ss:AutoFitWidth="0" ss:Width="119.25"/><!--<Column ss:Index="4" ss:AutoFitWidth="0" ss:Width="63.75"/>-->
+				<Column ss:AutoFitWidth="0" ss:Width="119.25"/>
+				<Column ss:AutoFitWidth="0" ss:Width="127.5"/>
+				<Column ss:AutoFitWidth="0" ss:Width="119.25"/>
+				<Column ss:AutoFitWidth="0" ss:Width="127.5"/>
+
+					<Row	ss:AutoFitHeight="0"	ss:Height="15.75">
+						<Cell	ss:MergeAcross="2"	ss:StyleID="s63"><Data ss:Type="String">PARCELLES</Data></Cell>
+						<Cell	ss:MergeAcross="3"	ss:StyleID="s64"><Data ss:Type="String">EMPRISES</Data></Cell>
+					</Row>
+
+					<Row ss:AutoFitHeight="0">
+						<Cell	ss:StyleID="s65"><Data ss:Type="String">Parcelle</Data></Cell>
+						<Cell	ss:StyleID="s65"><Data ss:Type="String">Adresse</Data></Cell> 
+						<Cell	ss:StyleID="s65"><Data ss:Type="String">Surface cadastrale (m²)</Data></Cell>
+						<Cell	ss:StyleID="s65"><Data ss:Type="String">Emprise bâtie (m²)</Data></Cell>
+						<Cell	ss:StyleID="s65"><Data ss:Type="String">Emprise bâtie (%)</Data></Cell>
+						<Cell	ss:StyleID="s65"><Data ss:Type="String">Emprise non bâtie (m²)</Data></Cell>
+						<Cell	ss:StyleID="s65"><Data ss:Type="String">Emprise non bâtie (%)</Data></Cell>
+					</Row>
+					<xsl:for-each select="Mj_Compte_Communal_Parcelles/Mj_Compte_Communal_Parcelle">
+
+						<Row ss:AutoFitHeight="0"> 
+							<Cell><Data ss:Type="String"><xsl:value-of select="./Mj_Parcelle/@idpar" /></Data></Cell>
+							<Cell><Data ss:Type="String"><xsl:value-of select="./Mj_Parcelle/@adresse" /></Data></Cell>
+							<Cell><Data ss:Type="Number"><xsl:value-of select="./Mj_Parcelle/@contenance" /></Data></Cell>
+							<Cell>
+								<Data ss:Type="Number">
+									<xsl:if test="./Mj_Parcelle/Mj_Emprises/@titre = 'Emprise Bati' ">
+										<xsl:if test="./Mj_Parcelle/Mj_Emprises[@titre='Emprise Bati']/@emprise_totale_intersect != '' ">
+											<xsl:value-of select="./Mj_Parcelle/Mj_Emprises[@titre='Emprise Bati']/@emprise_totale_intersect" />
+										</xsl:if>
+									</xsl:if>
+								</Data>
+							</Cell>	
+							<Cell>
+								<Data ss:Type="Number">
+
+									<xsl:if test="./Mj_Parcelle/Mj_Emprises/@titre = 'Emprise Bati' ">
+										<xsl:if test="./Mj_Parcelle/Mj_Emprises[@titre='Emprise Bati']/@emprise_totale_intersect != '' ">
+											<xsl:value-of select="./Mj_Parcelle/Mj_Emprises[@titre='Emprise Bati']/@emprise_totale_ratio" />
+										</xsl:if>
+									</xsl:if>
+								</Data>
+							</Cell>
+
+							<Cell>
+								<Data ss:Type="Number">
+									<xsl:if test="./Mj_Parcelle/Mj_Emprises/@titre = 'Emprise Bati' ">
+										<xsl:if test="./Mj_Parcelle/Mj_Emprises[@titre='Emprise Bati']/@emprise_totale_intersect != '' ">
+											<xsl:variable name="surf_parcelle" select="./Mj_Parcelle/@contenance"/>
+											<xsl:variable name="surf_emprisebati" select="./Mj_Parcelle/Mj_Emprises[@titre='Emprise Bati']/@emprise_totale_intersect"/>
+											<xsl:variable name="res" select="round((($surf_parcelle - $surf_emprisebati)*100))*0.01"/>
+											<xsl:value-of select="$res" />
+										</xsl:if>
+									</xsl:if>
+								</Data>
+							</Cell>
+
+							<Cell>
+								<Data ss:Type="Number">
+								
+									<xsl:if test="./Mj_Parcelle/Mj_Emprises/@titre = 'Emprise Bati' ">
+										<xsl:if test="./Mj_Parcelle/Mj_Emprises[@titre='Emprise Bati']/@emprise_totale_intersect != '' ">
+											<xsl:variable name="ratio_emprisebati" select="./Mj_Parcelle/Mj_Emprises[@titre='Emprise Bati']/@emprise_totale_ratio"/>
+											<xsl:variable name="resratio" select="100 - $ratio_emprisebati"/>
+											<xsl:value-of select="$resratio" />
+										</xsl:if>
+									</xsl:if>
+								</Data>
+							</Cell>
+						</Row>
+						
+
+					</xsl:for-each>
+
+					<Row ss:AutoFitHeight="0">	
+						<Cell><Data ss:Type="String">TOTAUX</Data></Cell>
+						<Cell><Data ss:Type="String"></Data></Cell>
+						<Cell><Data ss:Type="Number"><xsl:value-of select="./Mj_Compte_Communal_Parcelles/@Sum_contenance_m2" /></Data></Cell>
+						<Cell><Data ss:Type="Number"><xsl:value-of select="./Mj_Compte_Communal_Parcelles/@Sum_contenance_bati" /></Data></Cell>
+						<Cell><Data ss:Type="String"></Data></Cell>
+						<Cell>
+							<Data ss:Type="String">
+								<xsl:variable name="sum_contenance" select="./Mj_Compte_Communal_Parcelles/@Sum_contenance_m2"/>
+								<xsl:variable name="sum_contenance_bati" select="./Mj_Compte_Communal_Parcelles/@Sum_contenance_bati"/>
+								<xsl:variable name="sum_contenance_non_bati" select="$sum_contenance - $sum_contenance_bati"/>
+								<xsl:value-of select="$sum_contenance_non_bati" />	
+							</Data>
+						</Cell>
+						<Cell><Data ss:Type="String"></Data></Cell>	
+					</Row>
+
+			</Table>
+			<WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">
+				<PageSetup>
+					<Header x:Margin="0.3"/>
+					<Footer x:Margin="0.3"/>
+					<PageMargins x:Bottom="0.75" x:Left="0.7" x:Right="0.7" x:Top="0.75"/>
+				</PageSetup>
+				<Unsynced/>
+				<Print>
+					<ValidPrinterInfo/>
+					<PaperSizeIndex>9</PaperSizeIndex>
+					<HorizontalResolution>600</HorizontalResolution>
+					<VerticalResolution>600</VerticalResolution>
+				</Print>
+				<Selected/>
+				<ProtectObjects>False</ProtectObjects>
+				<ProtectScenarios>False</ProtectScenarios>
+			</WorksheetOptions>
+		 </Worksheet>
+	</Workbook>
+</xsl:template>
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/src/module_cadastreV2/web_service/class/majic_libV2/xsl/Mj_Rapport_Parcelle_EmprisePosPlu.xsl b/src/module_cadastreV2/web_service/class/majic_libV2/xsl/Mj_Rapport_Parcelle_EmprisePosPlu.xsl
new file mode 100755
index 0000000000000000000000000000000000000000..11609e534fd36229db8a43e42b94ad4cf6340b92
--- /dev/null
+++ b/src/module_cadastreV2/web_service/class/majic_libV2/xsl/Mj_Rapport_Parcelle_EmprisePosPlu.xsl
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding='utf-8' ?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:output method="xml" indent="yes"/>
+<xsl:template match="Rapport_Parcelle">
+<?mso-application progid="Excel.Sheet"?>
+	<Workbook xmlns="urn:schemas-microsoft-com:office:spreadsheet"
+		xmlns:o="urn:schemas-microsoft-com:office:office"
+		xmlns:x="urn:schemas-microsoft-com:office:excel"
+		xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet"
+		xmlns:html="http://www.w3.org/TR/REC-html40">
+		<DocumentProperties xmlns="urn:schemas-microsoft-com:office:office">
+			<Author>Veremap.pro</Author>
+			<LastAuthor>Veremap.pro</LastAuthor>
+			<Company>Veremes</Company>
+		</DocumentProperties>
+		<ExcelWorkbook xmlns="urn:schemas-microsoft-com:office:excel">
+			<WindowHeight>12300</WindowHeight>
+			<WindowWidth>18915</WindowWidth>
+			<WindowTopX>120</WindowTopX>
+			<WindowTopY>105</WindowTopY>
+			<ProtectStructure>False</ProtectStructure>
+			<ProtectWindows>False</ProtectWindows>
+		</ExcelWorkbook>
+		<Styles>
+			<Style ss:ID="Default" ss:Name="Normal">
+				<Alignment ss:Vertical="Bottom"/>
+				<Borders/>
+				<Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="11" ss:Color="#000000"/>
+				<Interior/>
+				<NumberFormat/>
+				<Protection/>
+			</Style>
+			<Style ss:ID="s61">
+				<Alignment ss:Vertical="Bottom" ss:WrapText="1"/>
+			</Style>
+			<Style ss:ID="s62">
+				<Alignment ss:Horizontal="Center" ss:WrapText="1"/>
+			</Style>
+			<Style ss:ID="s63">
+				<Alignment ss:Horizontal="Center" ss:Vertical="Bottom"/>
+				<Borders>
+					<Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/>
+					<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
+					<Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
+				</Borders>
+			</Style>
+			<Style ss:ID="s64">
+				<Alignment ss:Horizontal="Center" ss:Vertical="Bottom"/>
+				<Borders>
+					<Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/>
+					<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
+					<Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
+					<Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
+				</Borders>
+			</Style>
+			<Style ss:ID="s65">
+				<Alignment ss:Horizontal="Center" ss:Vertical="Bottom"/>
+			</Style>
+
+		</Styles>
+		<Worksheet ss:Name="Feuil1">
+			<Table ss:DefaultColumnWidth="60" ss:DefaultRowHeight="15">
+				<Column ss:AutoFitWidth="0" ss:Width="103.5"/>
+				<Column ss:AutoFitWidth="0" ss:Width="105"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Row>
+					<Cell ss:MergeAcross="2" ss:StyleID="s64"><Data ss:Type="String">PARCELLES</Data></Cell>
+					<Cell ss:MergeAcross="6" ss:StyleID="s64"><Data ss:Type="String">EMPRISES</Data></Cell>
+				</Row>
+				<Row ss:AutoFitHeight="0">
+					<Cell ss:StyleID="s65"><Data ss:Type="String">Parcelle</Data></Cell>
+					<Cell ss:StyleID="s65"><Data ss:Type="String">Adresse</Data></Cell>
+					<Cell ss:StyleID="s65"><Data ss:Type="String">Surface cadastrale (m²)</Data></Cell>
+					<Cell ss:StyleID="s65"><Data ss:Type="String"></Data></Cell>
+					<Cell ss:StyleID="s65"><Data ss:Type="String"></Data></Cell>
+					<Cell ss:StyleID="s65"><Data ss:Type="String"></Data></Cell>
+					<Cell ss:StyleID="s65"><Data ss:Type="String"></Data></Cell>
+					<Cell ss:StyleID="s65"><Data ss:Type="String"></Data></Cell>
+					<Cell ss:StyleID="s65"><Data ss:Type="String"></Data></Cell>
+					<Cell ss:StyleID="s65"><Data ss:Type="String"></Data></Cell>
+				</Row>
+
+				<xsl:for-each select="Mj_Compte_Communal_Parcelles/Mj_Compte_Communal_Parcelle">
+					<Row ss:AutoFitHeight="0">
+						<Cell><Data ss:Type="String"><xsl:value-of select="./Mj_Parcelle/@idpar" /></Data></Cell>
+						<Cell><Data ss:Type="String"><xsl:value-of select="./Mj_Parcelle/@adresse" /></Data></Cell>
+						<Cell><Data ss:Type="Number"><xsl:value-of select="./Mj_Parcelle/@contenance" /></Data></Cell>
+						<xsl:for-each select="./Mj_Parcelle/Mj_Emprises">
+							<Cell><Data ss:Type="String"><xsl:value-of select="./@titre" /> :</Data></Cell>
+							<xsl:for-each select="./Mj_Emprise">
+								<Cell>
+									<Data ss:Type="String">Pourcentage de la parcelle intersectée : <xsl:value-of select="./@emprise_ratio_label" />,
+<xsl:for-each select="./Mj_Attributes/Mj_Attribute">
+											<xsl:if test="./@title != '' ">
+<xsl:value-of select="./@title" /> : <xsl:value-of select="./@value" /><xsl:if test="./@label = 'intersect' "> m²</xsl:if>,
+</xsl:if>
+										</xsl:for-each>
+									</Data>
+								</Cell>
+							</xsl:for-each>
+						</xsl:for-each>
+					</Row>
+				</xsl:for-each>
+
+				<Row ss:AutoFitHeight="0">
+					<Cell><Data ss:Type="String">TOTAUX</Data></Cell>
+					<Cell><Data ss:Type="String"></Data></Cell>
+					<Cell><Data ss:Type="Number"><xsl:value-of select="./Mj_Compte_Communal_Parcelles/@Sum_contenance_m2" /></Data></Cell>
+					<Cell><Data ss:Type="String"></Data></Cell>
+					<Cell><Data ss:Type="String"></Data></Cell>
+					<Cell><Data ss:Type="String"></Data></Cell>
+					<Cell><Data ss:Type="String"></Data></Cell>
+					<Cell><Data ss:Type="String"></Data></Cell>
+					<Cell><Data ss:Type="String"></Data></Cell>
+					<Cell><Data ss:Type="String"></Data></Cell>
+				</Row>
+			</Table>
+
+			<WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">
+				<PageSetup>
+					<Header x:Margin="0.3"/>
+					<Footer x:Margin="0.3"/>
+					<PageMargins x:Bottom="0.75" x:Left="0.7" x:Right="0.7" x:Top="0.75"/>
+				</PageSetup>
+				<Unsynced/>
+				<Print>
+					<ValidPrinterInfo/>
+					<PaperSizeIndex>9</PaperSizeIndex>
+					<HorizontalResolution>600</HorizontalResolution>
+					<VerticalResolution>600</VerticalResolution>
+				</Print>
+				<Selected/>
+				<ProtectObjects>False</ProtectObjects>
+				<ProtectScenarios>False</ProtectScenarios>
+			</WorksheetOptions>
+		 </Worksheet>
+	</Workbook>
+</xsl:template>
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/src/module_cadastreV2/web_service/class/majic_libV2/xsl/Mj_Rapport_Parcelle_Locaux.xsl b/src/module_cadastreV2/web_service/class/majic_libV2/xsl/Mj_Rapport_Parcelle_Locaux.xsl
new file mode 100755
index 0000000000000000000000000000000000000000..6e9e81826598281faac36fcf1ee8711e4919aca5
--- /dev/null
+++ b/src/module_cadastreV2/web_service/class/majic_libV2/xsl/Mj_Rapport_Parcelle_Locaux.xsl
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding='utf-8' ?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:output method="xml" indent="yes"/>
+<xsl:template match="Rapport_Parcelle">
+<?mso-application progid="Excel.Sheet"?>
+	<Workbook xmlns="urn:schemas-microsoft-com:office:spreadsheet"
+		xmlns:o="urn:schemas-microsoft-com:office:office"
+		xmlns:x="urn:schemas-microsoft-com:office:excel"
+		xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet"
+		xmlns:html="http://www.w3.org/TR/REC-html40">
+		<DocumentProperties xmlns="urn:schemas-microsoft-com:office:office">
+			<Author>Veremap.pro</Author>
+			<LastAuthor>Veremap.pro</LastAuthor>
+			<Company>Veremes</Company>
+		</DocumentProperties>
+		<ExcelWorkbook xmlns="urn:schemas-microsoft-com:office:excel">
+			<WindowHeight>12300</WindowHeight>
+			<WindowWidth>18915</WindowWidth>
+			<WindowTopX>120</WindowTopX>
+			<WindowTopY>105</WindowTopY>
+			<ProtectStructure>False</ProtectStructure>
+			<ProtectWindows>False</ProtectWindows>
+		</ExcelWorkbook>
+		<Styles>
+			<Style ss:ID="Default" ss:Name="Normal">
+				<Alignment ss:Vertical="Bottom"/>
+				<Borders/>
+				<Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="11" ss:Color="#000000"/>
+				<Interior/>
+				<NumberFormat/>
+				<Protection/>
+			</Style>
+
+			<Style ss:ID="s63">
+				<Alignment ss:Horizontal="Center" ss:Vertical="Bottom"/>
+				<Borders>
+					<Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/>
+					<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
+					<Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
+				</Borders>
+			</Style>
+			<Style ss:ID="s64">
+				<Alignment ss:Horizontal="Center" ss:Vertical="Bottom"/>
+				<Borders>
+					<Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/>
+					<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
+					<Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
+					<Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
+				</Borders>
+			</Style>
+			<Style ss:ID="s65">
+				<Alignment ss:Horizontal="Center" ss:Vertical="Bottom"/>
+			</Style>
+
+		</Styles>
+		 <Worksheet ss:Name="Feuil1">
+			<Table ss:DefaultColumnWidth="60" ss:DefaultRowHeight="15">
+				<Column ss:AutoFitWidth="0" ss:Width="85"/>
+				<Column ss:AutoFitWidth="0" ss:Width="125"/>
+				<Column ss:AutoFitWidth="0" ss:Width="115"/>
+				<Column ss:AutoFitWidth="0" ss:Width="135"/>
+				<Column ss:AutoFitWidth="0" ss:Width="115"/>
+				<Column ss:AutoFitWidth="0" ss:Width="105"/>
+				<Column ss:AutoFitWidth="0" ss:Width="90"/>
+
+				<Row ss:AutoFitHeight="0" ss:Height="15.75">
+					<Cell ss:MergeAcross="2" ss:StyleID="s63"><Data ss:Type="String">PARCELLES</Data></Cell>
+					<Cell ss:MergeAcross="3" ss:StyleID="s64"><Data ss:Type="String">LOCAUX</Data></Cell>
+				</Row>
+
+				<Row ss:AutoFitHeight="0" ss:StyleID="s65">
+					<Cell><Data ss:Type="String">Parcelle</Data></Cell>
+					<Cell><Data ss:Type="String">Adresse</Data></Cell> 
+					<Cell><Data ss:Type="String">Surface cadastrale (m²)</Data></Cell>
+					<Cell><Data ss:Type="String">Adresse local</Data></Cell>
+					<Cell><Data ss:Type="String">Type de local</Data></Cell>
+					<Cell><Data ss:Type="String">Valeur locative (Euros)</Data></Cell>
+					<Cell><Data ss:Type="String">Millièmes et lots</Data></Cell>
+				</Row>
+
+				<xsl:for-each select="Mj_Bati_Parcelles/Mj_Bati_Parcelle">
+					<Row ss:AutoFitHeight="0"> 
+						<Cell><Data ss:Type="String"><xsl:value-of select="@id_par" /></Data></Cell>
+						<Cell><Data ss:Type="String"><xsl:value-of select="@adresse" /></Data></Cell>
+						<Cell><Data ss:Type="Number"><xsl:value-of select="@contenance" /></Data></Cell>
+						<xsl:if test="./Mj_Bati/@bat != '' ">
+							<Cell><Data ss:Type="String"><xsl:value-of select="./Mj_Bati/@voirie" /> <xsl:value-of select="./Mj_Bati/@adresse" /></Data></Cell>
+							<Cell><Data ss:Type="String"><xsl:value-of select="./Mj_Bati/@dteloc" /></Data></Cell>
+							<Cell><Data ss:Type="Number"><xsl:value-of select="./Mj_Bati/@dvlpera" /></Data></Cell>
+							<xsl:if test="./Mj_Bati/@dnumql != '' ">
+								<Cell><Data ss:Type="String"><xsl:value-of select="./Mj_Bati/@dnumql" />/<xsl:value-of select="./Mj_Bati/@ddenql" /></Data></Cell>
+							</xsl:if>
+							<xsl:if test="./Mj_Bati/@dnumql = '' ">
+								<Cell><Data ss:Type="String"></Data></Cell>
+							</xsl:if>
+						</xsl:if>
+						<xsl:if test="./Mj_Bati/@bat = '' ">
+							<Cell><Data ss:Type="String"></Data></Cell>
+							<Cell><Data ss:Type="String"></Data></Cell>
+							<Cell><Data ss:Type="String"></Data></Cell>
+							<Cell><Data ss:Type="String"></Data></Cell>
+						</xsl:if>
+					</Row>
+					<xsl:for-each select="./Mj_Bati">
+						<xsl:if test="position()!=1">
+							<Row ss:AutoFitHeight="0">
+								<Cell><Data ss:Type="String"></Data></Cell>
+								<Cell><Data ss:Type="String"></Data></Cell>
+								<Cell><Data ss:Type="String"></Data></Cell>
+								<Cell><Data ss:Type="String"><xsl:value-of select="./@voirie" /> <xsl:value-of select="./@adresse" /></Data></Cell>
+								<Cell><Data ss:Type="String"><xsl:value-of select="./@dteloc" /></Data></Cell>
+								<Cell><Data ss:Type="Number"><xsl:value-of select="./@dvlpera" /></Data></Cell>
+								<xsl:if test="./@dnumql != '' ">
+									<Cell><Data ss:Type="String"><xsl:value-of select="./@dnumql" />/<xsl:value-of select="./@ddenql" /></Data></Cell>
+								</xsl:if>
+								<xsl:if test="./@dnumql = '' ">
+									<Cell><Data ss:Type="String"></Data></Cell>
+								</xsl:if>
+							</Row>
+						</xsl:if>
+					</xsl:for-each>
+				</xsl:for-each> 
+
+				<Row ss:AutoFitHeight="0">
+					<Cell><Data ss:Type="String">TOTAUX</Data></Cell>
+					<Cell><Data ss:Type="String"></Data></Cell>
+					<Cell><Data ss:Type="Number"><xsl:value-of select="./Mj_Bati_Parcelles/@sum_contenance_m2" /></Data></Cell>
+					<Cell><Data ss:Type="String"></Data></Cell>
+					<Cell><Data ss:Type="String"></Data></Cell>
+					<Cell><Data ss:Type="Number"><xsl:value-of select="./Mj_Bati_Parcelles/@sum_valeur_locative" /></Data></Cell>
+					<Cell><Data ss:Type="String"></Data></Cell>
+				</Row>
+
+			</Table>
+			<WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">
+				<PageSetup>
+					<Header x:Margin="0.3"/>
+					<Footer x:Margin="0.3"/>
+					<PageMargins x:Bottom="0.75" x:Left="0.7" x:Right="0.7" x:Top="0.75"/>
+				</PageSetup>
+				<Unsynced/>
+				<Print>
+					<ValidPrinterInfo/>
+					<PaperSizeIndex>9</PaperSizeIndex>
+					<HorizontalResolution>600</HorizontalResolution>
+					<VerticalResolution>600</VerticalResolution>
+				</Print>
+				<Selected/>
+				<ProtectObjects>False</ProtectObjects>
+				<ProtectScenarios>False</ProtectScenarios>
+			</WorksheetOptions>
+		</Worksheet>
+	</Workbook>
+</xsl:template>
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/src/module_cadastreV2/web_service/class/majic_libV2/xsl/Mj_Rapport_Parcelle_Proprietaire.xsl b/src/module_cadastreV2/web_service/class/majic_libV2/xsl/Mj_Rapport_Parcelle_Proprietaire.xsl
new file mode 100755
index 0000000000000000000000000000000000000000..3c66653edafcbeb926e415a1bfe4de1745f291d2
--- /dev/null
+++ b/src/module_cadastreV2/web_service/class/majic_libV2/xsl/Mj_Rapport_Parcelle_Proprietaire.xsl
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding='utf-8' ?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:output method="xml" indent="yes"/>
+<xsl:template match="Rapport_Parcelle">
+<?mso-application progid="Excel.Sheet"?>
+	<Workbook xmlns="urn:schemas-microsoft-com:office:spreadsheet"
+		xmlns:o="urn:schemas-microsoft-com:office:office"
+		xmlns:x="urn:schemas-microsoft-com:office:excel"
+		xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet"
+		xmlns:html="http://www.w3.org/TR/REC-html40">
+		<DocumentProperties xmlns="urn:schemas-microsoft-com:office:office">
+			<Author>Veremap.pro</Author>
+			<LastAuthor>Veremap.pro</LastAuthor>
+			<Company>Veremes</Company>
+		</DocumentProperties>
+		<ExcelWorkbook xmlns="urn:schemas-microsoft-com:office:excel">
+			<WindowHeight>12300</WindowHeight>
+			<WindowWidth>18915</WindowWidth>
+			<WindowTopX>120</WindowTopX>
+			<WindowTopY>105</WindowTopY>
+			<ProtectStructure>False</ProtectStructure>
+			<ProtectWindows>False</ProtectWindows>
+		</ExcelWorkbook>
+		<Styles>
+			<Style ss:ID="Default" ss:Name="Normal">
+				<Alignment ss:Vertical="Bottom"/>
+				<Borders/>
+				<Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="11" ss:Color="#000000"/>
+				<Interior/>
+				<NumberFormat/>
+				<Protection/>
+			</Style>
+
+			<Style	ss:ID="s63">
+				<Alignment	ss:Horizontal="Center"	ss:Vertical="Bottom"/>
+				<Borders>
+					<Border	ss:Position="Bottom"	ss:LineStyle="Continuous"	ss:Weight="2"/>
+					<Border	ss:Position="Left"	ss:LineStyle="Continuous"	ss:Weight="2"/>
+					<Border	ss:Position="Top"	ss:LineStyle="Continuous"	ss:Weight="2"/>
+				</Borders>
+			</Style>
+			<Style	ss:ID="s64">
+				<Alignment	ss:Horizontal="Center"	ss:Vertical="Bottom"/>
+				<Borders>
+					<Border	ss:Position="Bottom"	ss:LineStyle="Continuous"	ss:Weight="2"/>
+					<Border	ss:Position="Left"	ss:LineStyle="Continuous"	ss:Weight="2"/>
+					<Border	ss:Position="Right"	ss:LineStyle="Continuous"	ss:Weight="2"/>
+					<Border	ss:Position="Top"	ss:LineStyle="Continuous"	ss:Weight="2"/>
+				</Borders>
+			</Style>
+			<Style	ss:ID="s65">
+				<Alignment	ss:Horizontal="Center"	ss:Vertical="Bottom"/>
+			</Style>
+
+		</Styles>
+		 <Worksheet ss:Name="Feuil1">
+			<!--<xsl:variable name="nb_ligne"><xsl:value-of select="./XmlMapLog/XmlLog/@nb_ligne" /></xsl:variable>-->
+			<Table ss:DefaultColumnWidth="60" ss:DefaultRowHeight="15">
+				<!--<xsl:attribute name="ss:ExpandedRowCount"><xsl:value-of select="1000" /></xsl:attribute>-->
+				<Column ss:AutoFitWidth="0" ss:Width="103.5"/>
+				<Column ss:AutoFitWidth="0" ss:Width="105"/>
+				<Column ss:Index="4" ss:AutoFitWidth="0" ss:Width="63.75"/>
+				<Column ss:AutoFitWidth="0" ss:Width="119.25"/>
+				<Column ss:AutoFitWidth="0" ss:Width="127.5"/>
+
+					<Row	ss:AutoFitHeight="0"	ss:Height="15.75">
+						<Cell	ss:MergeAcross="2"	ss:StyleID="s63"><Data ss:Type="String">PARCELLES</Data></Cell>
+						<Cell	ss:MergeAcross="2"	ss:StyleID="s64"><Data ss:Type="String">PROPRIETAIRES</Data></Cell>
+					</Row>
+					<Row ss:AutoFitHeight="0">
+						<Cell	ss:StyleID="s65"><Data ss:Type="String">Parcelle</Data></Cell>
+						<Cell	ss:StyleID="s65"><Data ss:Type="String">Adresse</Data></Cell> 
+						<Cell	ss:StyleID="s65"><Data ss:Type="String">Surface cadastrale (m²)</Data></Cell>
+						<Cell	ss:StyleID="s65"><Data ss:Type="String">Compte propriétaire</Data></Cell>
+						<Cell	ss:StyleID="s65"><Data ss:Type="String">Nom</Data></Cell>
+						<Cell	ss:StyleID="s65"><Data ss:Type="String">Adresse</Data></Cell>
+					</Row>
+
+					<xsl:for-each select="Mj_Compte_Communal_Parcelles/Mj_Compte_Communal_Parcelle">
+
+						<Row ss:AutoFitHeight="0"> 
+							<Cell><Data ss:Type="String"><xsl:value-of select="./Mj_Parcelle/@idpar" /></Data></Cell>
+							<Cell><Data ss:Type="String"><xsl:value-of select="./Mj_Parcelle/@adresse" /></Data></Cell>
+							<Cell><Data ss:Type="Number"><xsl:value-of select="./Mj_Parcelle/@contenance" /></Data></Cell>
+							<Cell><Data ss:Type="String"><xsl:value-of select="./Mj_Proprietaire/@dnupro" /></Data></Cell>
+							<Cell><Data ss:Type="String"><xsl:value-of select="./Mj_Proprietaire/@proprietaire_nom" /></Data></Cell>
+							<Cell><Data ss:Type="String"><xsl:value-of select="./Mj_Proprietaire/@proprietaire_adresse" /></Data></Cell>
+						</Row>
+
+						<xsl:for-each select="./Mj_Proprietaire">
+							<xsl:if test="position()!=1">
+								<Row ss:AutoFitHeight="0">
+									<Cell><Data ss:Type="String"></Data></Cell>
+									<Cell><Data ss:Type="String"></Data></Cell>
+									<Cell><Data ss:Type="String"></Data></Cell>
+									<Cell><Data ss:Type="String"></Data></Cell>
+									<Cell><Data ss:Type="String"><xsl:value-of select="@proprietaire_nom" /></Data></Cell>
+									<Cell><Data ss:Type="String"><xsl:value-of select="@proprietaire_adresse" /></Data></Cell>
+								</Row>
+							</xsl:if>
+						</xsl:for-each>
+					</xsl:for-each> 
+
+					<Row ss:AutoFitHeight="0">
+						<Cell><Data ss:Type="String">TOTAUX</Data></Cell>
+						<Cell><Data ss:Type="String"></Data></Cell>
+						<Cell><Data ss:Type="Number"><xsl:value-of select="./Mj_Compte_Communal_Parcelles/@Sum_contenance_m2" /></Data></Cell>
+						<Cell><Data ss:Type="String"></Data></Cell>
+						<Cell><Data ss:Type="String"></Data></Cell>
+						<Cell><Data ss:Type="String"></Data></Cell>
+					</Row>
+
+			</Table>
+			<WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">
+				<PageSetup>
+					<Header x:Margin="0.3"/>
+					<Footer x:Margin="0.3"/>
+					<PageMargins x:Bottom="0.75" x:Left="0.7" x:Right="0.7" x:Top="0.75"/>
+				</PageSetup>
+				<Unsynced/>
+				<Print>
+					<ValidPrinterInfo/>
+					<PaperSizeIndex>9</PaperSizeIndex>
+					<HorizontalResolution>600</HorizontalResolution>
+					<VerticalResolution>600</VerticalResolution>
+				</Print>
+				<Selected/>
+				<ProtectObjects>False</ProtectObjects>
+				<ProtectScenarios>False</ProtectScenarios>
+			</WorksheetOptions>
+		 </Worksheet>
+	</Workbook>
+</xsl:template>
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/src/module_cadastreV2/web_service/class/majic_libV2/xsl/Mj_Rapport_Parcelle_ProprietaireLocaux.xsl b/src/module_cadastreV2/web_service/class/majic_libV2/xsl/Mj_Rapport_Parcelle_ProprietaireLocaux.xsl
new file mode 100755
index 0000000000000000000000000000000000000000..d56b59061bdea6162c398eb76187794bc5859582
--- /dev/null
+++ b/src/module_cadastreV2/web_service/class/majic_libV2/xsl/Mj_Rapport_Parcelle_ProprietaireLocaux.xsl
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding='utf-8' ?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:output method="xml" indent="yes"/>
+<xsl:template match="Rapport_Parcelle">
+<?mso-application progid="Excel.Sheet"?>
+	<Workbook xmlns="urn:schemas-microsoft-com:office:spreadsheet"
+		xmlns:o="urn:schemas-microsoft-com:office:office"
+		xmlns:x="urn:schemas-microsoft-com:office:excel"
+		xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet"
+		xmlns:html="http://www.w3.org/TR/REC-html40">
+		<DocumentProperties xmlns="urn:schemas-microsoft-com:office:office">
+			<Author>Veremap.pro</Author>
+			<LastAuthor>Veremap.pro</LastAuthor>
+			<Company>Veremes</Company>
+		</DocumentProperties>
+		<ExcelWorkbook xmlns="urn:schemas-microsoft-com:office:excel">
+			<WindowHeight>12300</WindowHeight>
+			<WindowWidth>18915</WindowWidth>
+			<WindowTopX>120</WindowTopX>
+			<WindowTopY>105</WindowTopY>
+			<ProtectStructure>False</ProtectStructure>
+			<ProtectWindows>False</ProtectWindows>
+		</ExcelWorkbook>
+		<Styles>
+			<Style ss:ID="Default" ss:Name="Normal">
+				<Alignment ss:Vertical="Bottom"/>
+				<Borders/>
+				<Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="11" ss:Color="#000000"/>
+				<Interior/>
+				<NumberFormat/>
+				<Protection/>
+			</Style>
+			<Style	ss:ID="s64">
+				<Alignment	ss:Horizontal="Center"	ss:Vertical="Top"/>
+				<Borders>
+					<Border	ss:Position="Bottom"	ss:LineStyle="Continuous"	ss:Weight="2"/>
+					<Border	ss:Position="Left"	ss:LineStyle="Continuous"	ss:Weight="2"/>
+					<Border	ss:Position="Right"	ss:LineStyle="Continuous"	ss:Weight="2"/>
+					<Border	ss:Position="Top"	ss:LineStyle="Continuous"	ss:Weight="2"/>
+				</Borders>
+			</Style>
+			<Style ss:ID="s65">
+				<Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
+			</Style>
+		</Styles>
+
+		<Worksheet ss:Name="Feuil1">
+			<!--<xsl:variable name="nb_ligne"><xsl:value-of select="./XmlMapLog/XmlLog/@nb_ligne" /></xsl:variable>-->
+			<Table ss:DefaultColumnWidth="60" ss:DefaultRowHeight="15">
+				<!--<xsl:attribute name="ss:ExpandedRowCount"><xsl:value-of select="1000" /></xsl:attribute>-->
+				<Column ss:AutoFitWidth="0" ss:Width="100"/>
+				<Column ss:AutoFitWidth="0" ss:Width="100"/>
+				<Column ss:AutoFitWidth="0" ss:Width="200"/>
+				<Column ss:AutoFitWidth="0" ss:Width="55"/>
+				<Column ss:AutoFitWidth="0" ss:Width="60"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="90"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="45"/>
+				<Column ss:AutoFitWidth="0" ss:Width="200"/>
+				<Column ss:AutoFitWidth="0" ss:Width="80"/>
+				<Column ss:AutoFitWidth="0" ss:Width="115"/>
+				<Column ss:AutoFitWidth="0" ss:Width="200"/>
+				<Column ss:AutoFitWidth="0" ss:Width="70"/>
+				<Column ss:AutoFitWidth="0" ss:Width="80"/>
+				<Row ss:AutoFitHeight="0" ss:Height="15.75" ss:StyleID="s64">
+					<Cell ss:MergeAcross="3"><Data ss:Type="String">PARCELLES</Data></Cell>
+					<Cell ss:MergeAcross="12"><Data ss:Type="String">LOCAUX</Data></Cell>
+				</Row>
+
+				<Row ss:AutoFitHeight="0" ss:Height="30" ss:StyleID="s65">
+					<Cell><Data ss:Type="String">Parcelle</Data></Cell>
+					<Cell><Data ss:Type="String">Commune</Data></Cell>
+					<Cell><Data ss:Type="String">Adresse parcelle</Data></Cell>
+					<Cell><Data ss:Type="String">Superficie parcelle(m²)</Data></Cell>
+					<Cell><Data ss:Type="String">Invariant</Data></Cell>
+					<Cell><Data ss:Type="String">Superficie local(m²)</Data></Cell>
+					<Cell><Data ss:Type="String">Type</Data></Cell>
+					<Cell><Data ss:Type="String">Nature</Data></Cell>
+					<Cell><Data ss:Type="String">Occupation</Data></Cell>
+					<Cell><Data ss:Type="String">Année construction</Data></Cell>
+					<Cell><Data ss:Type="String">Étage</Data></Cell>
+					<Cell><Data ss:Type="String">Adresse local</Data></Cell>
+					<Cell><Data ss:Type="String">Compte propriétaire</Data></Cell>
+					<Cell><Data ss:Type="String">Propriétaire</Data></Cell>
+					<Cell><Data ss:Type="String">Adresse propriétaire</Data></Cell>
+					<Cell><Data ss:Type="String">Indivision</Data></Cell>
+					<Cell><Data ss:Type="String">Droit</Data></Cell>
+				</Row>
+
+				<xsl:for-each select="Mj_Bati_Parcelles/Mj_Bati_Parcelle">
+					<Row ss:AutoFitHeight="0">
+						<Cell><Data ss:Type="String"><xsl:value-of select="@id_par" /></Data></Cell>
+						<Cell><Data ss:Type="String"><xsl:value-of select="@com" /></Data></Cell>
+						<Cell><Data ss:Type="String"><xsl:value-of select="@adresse" /></Data></Cell>
+						<Cell><Data ss:Type="Number"><xsl:value-of select="@contenance" /></Data></Cell>
+						<xsl:if test="./Mj_Bati/@bat != '' ">
+							<Cell><Data ss:Type="String"><xsl:value-of select="./Mj_Bati/@num_invar" /></Data></Cell>
+							<Cell><Data ss:Type="Number"><xsl:value-of select="./Mj_Bati/Mj_Pev/Mj_Habit_Descr/@suf_piece_total" /></Data></Cell>
+							<Cell><Data ss:Type="String"><xsl:value-of select="./Mj_Bati/@local_type" /></Data></Cell>
+							<Cell><Data ss:Type="String"><xsl:value-of select="./Mj_Bati/@lib_nature" /></Data></Cell>
+							<Cell><Data ss:Type="String"><xsl:value-of select="./Mj_Bati/@lib_occupation" /></Data></Cell>
+							<Cell><Data ss:Type="String"><xsl:value-of select="./Mj_Bati/@annee_constr" /></Data></Cell>
+							<Cell><Data ss:Type="String"><xsl:value-of select="./Mj_Bati/@niv" /></Data></Cell>
+							<Cell><Data ss:Type="String">Batiment <xsl:value-of select="./Mj_Bati/@bat" /> <xsl:value-of select="./Mj_Bati/@ent" />, Etage <xsl:value-of select="./Mj_Bati/@niv" />, Porte  <xsl:value-of select="./Mj_Bati/@num_de_porte" />,, <xsl:value-of select="./Mj_Bati/@adresse" /></Data></Cell>
+						</xsl:if>
+						<xsl:if test="./Mj_Bati/@bat = '' ">
+							<Cell><Data ss:Type="String"></Data></Cell>
+							<Cell><Data ss:Type="String"></Data></Cell>
+							<Cell><Data ss:Type="String"></Data></Cell>
+							<Cell><Data ss:Type="String"></Data></Cell>
+							<Cell><Data ss:Type="String"></Data></Cell>
+							<Cell><Data ss:Type="String"></Data></Cell>
+							<Cell><Data ss:Type="String"></Data></Cell>
+							<Cell><Data ss:Type="String"></Data></Cell>
+						</xsl:if>
+						<Cell><Data ss:Type="String"><xsl:value-of select="./Mj_Bati/Mj_Proprietaire/@dnupro" /></Data></Cell>
+						<Cell><Data ss:Type="String"><xsl:value-of select="./Mj_Bati/Mj_Proprietaire/@proprietaire_nom" /></Data></Cell>
+						<Cell><Data ss:Type="String"><xsl:value-of select="./Mj_Bati/Mj_Proprietaire/@proprietaire_adresse" /></Data></Cell>
+						<Cell><Data ss:Type="String"><xsl:value-of select="./Mj_Bati/Mj_Proprietaire/@l_ccodem" /></Data></Cell>
+						<Cell><Data ss:Type="String"><xsl:value-of select="./Mj_Bati/Mj_Proprietaire/@l_ccodro" /></Data></Cell>
+					</Row>
+
+					<xsl:for-each select="./Mj_Bati/Mj_Proprietaire">
+						<xsl:if test="position()!=1">
+							<Row ss:AutoFitHeight="0">
+								<Cell><Data ss:Type="String"></Data></Cell>
+								<Cell><Data ss:Type="String"></Data></Cell>
+								<Cell><Data ss:Type="String"></Data></Cell>
+								<Cell><Data ss:Type="String"></Data></Cell>
+								<Cell><Data ss:Type="String"><xsl:value-of select="../@num_invar" /></Data></Cell>
+								<Cell><Data ss:Type="Number"><xsl:value-of select="../Mj_Pev/Mj_Habit_Descr/@suf_piece_total" /></Data></Cell>
+								<Cell><Data ss:Type="String"><xsl:value-of select="../@local_type" /></Data></Cell>
+								<Cell><Data ss:Type="String"><xsl:value-of select="../@lib_nature" /></Data></Cell>
+								<Cell><Data ss:Type="String"><xsl:value-of select="../@lib_occupation" /></Data></Cell>
+								<Cell><Data ss:Type="String"><xsl:value-of select="../@annee_constr" /></Data></Cell>
+								<Cell><Data ss:Type="String"><xsl:value-of select="../@niv" /></Data></Cell>
+								<Cell><Data ss:Type="String">Batiment <xsl:value-of select="../@bat" /> <xsl:value-of select="../@ent" />, Etage <xsl:value-of select="../@niv" />, Porte  <xsl:value-of select="../@num_de_porte" />,, <xsl:value-of select="../@adresse" /></Data></Cell>
+								<Cell><Data ss:Type="String"><xsl:value-of select="./@dnupro" /></Data></Cell>
+								<Cell><Data ss:Type="String"><xsl:value-of select="./@proprietaire_nom" /></Data></Cell>
+								<Cell><Data ss:Type="String"><xsl:value-of select="./@proprietaire_adresse" /></Data></Cell>
+								<Cell><Data ss:Type="String"><xsl:value-of select="./@l_ccodem" /></Data></Cell>
+								<Cell><Data ss:Type="String"><xsl:value-of select="./@l_ccodro" /></Data></Cell>
+							</Row>
+						</xsl:if>
+					</xsl:for-each>
+				</xsl:for-each>
+
+				<Row ss:AutoFitHeight="0">
+					<Cell><Data ss:Type="String">TOTAUX</Data></Cell>
+					<Cell><Data ss:Type="String"></Data></Cell>
+					<Cell><Data ss:Type="String"></Data></Cell>
+					<Cell><Data ss:Type="Number"><xsl:value-of select="./Mj_Bati_Parcelles/@sum_contenance_m2" /></Data></Cell>
+				</Row>
+
+			</Table>
+			<WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">
+				<PageSetup>
+					<Header x:Margin="0.3"/>
+					<Footer x:Margin="0.3"/>
+					<PageMargins x:Bottom="0.75" x:Left="0.7" x:Right="0.7" x:Top="0.75"/>
+				</PageSetup>
+				<Unsynced/>
+				<Print>
+					<ValidPrinterInfo/>
+					<PaperSizeIndex>9</PaperSizeIndex>
+					<HorizontalResolution>600</HorizontalResolution>
+					<VerticalResolution>600</VerticalResolution>
+				</Print>
+				<Selected/>
+				<ProtectObjects>False</ProtectObjects>
+				<ProtectScenarios>False</ProtectScenarios>
+			</WorksheetOptions>
+		 </Worksheet>
+	</Workbook>
+</xsl:template>
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/src/module_cadastreV2/web_service/class/majic_libV2/xsl/Mj_Rapport_Parcelle_SubdivisionFiscale.xsl b/src/module_cadastreV2/web_service/class/majic_libV2/xsl/Mj_Rapport_Parcelle_SubdivisionFiscale.xsl
new file mode 100755
index 0000000000000000000000000000000000000000..07e3ff46c37426c1bf48f59689be2116ca8c0be2
--- /dev/null
+++ b/src/module_cadastreV2/web_service/class/majic_libV2/xsl/Mj_Rapport_Parcelle_SubdivisionFiscale.xsl
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding='utf-8' ?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:output method="xml" indent="yes"/>
+<xsl:template match="Rapport_Parcelle">
+<?mso-application progid="Excel.Sheet"?>
+	<Workbook xmlns="urn:schemas-microsoft-com:office:spreadsheet"
+		xmlns:o="urn:schemas-microsoft-com:office:office"
+		xmlns:x="urn:schemas-microsoft-com:office:excel"
+		xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet"
+		xmlns:html="http://www.w3.org/TR/REC-html40">
+		<DocumentProperties xmlns="urn:schemas-microsoft-com:office:office">
+			<Author>Veremap.pro</Author>
+			<LastAuthor>Veremap.pro</LastAuthor>
+			<Company>Veremes</Company>
+		</DocumentProperties>
+		<ExcelWorkbook xmlns="urn:schemas-microsoft-com:office:excel">
+			<WindowHeight>12300</WindowHeight>
+			<WindowWidth>18915</WindowWidth>
+			<WindowTopX>120</WindowTopX>
+			<WindowTopY>105</WindowTopY>
+			<ProtectStructure>False</ProtectStructure>
+			<ProtectWindows>False</ProtectWindows>
+		</ExcelWorkbook>
+		<Styles>
+			<Style ss:ID="Default" ss:Name="Normal">
+				<Alignment ss:Vertical="Bottom"/>
+				<Borders/>
+				<Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="11" ss:Color="#000000"/>
+				<Interior/>
+				<NumberFormat/>
+				<Protection/>
+			</Style>
+
+			<Style	ss:ID="s63">
+				<Alignment	ss:Horizontal="Center"	ss:Vertical="Bottom"/>
+				<Borders>
+					<Border	ss:Position="Bottom"	ss:LineStyle="Continuous"	ss:Weight="2"/>
+					<Border	ss:Position="Left"	ss:LineStyle="Continuous"	ss:Weight="2"/>
+					<Border	ss:Position="Top"	ss:LineStyle="Continuous"	ss:Weight="2"/>
+				</Borders>
+			</Style>
+			<Style	ss:ID="s64">
+				<Alignment	ss:Horizontal="Center"	ss:Vertical="Bottom"/>
+				<Borders>
+					<Border	ss:Position="Bottom"	ss:LineStyle="Continuous"	ss:Weight="2"/>
+					<Border	ss:Position="Left"	ss:LineStyle="Continuous"	ss:Weight="2"/>
+					<Border	ss:Position="Right"	ss:LineStyle="Continuous"	ss:Weight="2"/>
+					<Border	ss:Position="Top"	ss:LineStyle="Continuous"	ss:Weight="2"/>
+				</Borders>
+			</Style>
+			<Style	ss:ID="s65">
+				<Alignment	ss:Horizontal="Center"	ss:Vertical="Bottom"/>
+			</Style>
+
+		</Styles>
+		 <Worksheet ss:Name="Feuil1">
+			<Table ss:DefaultColumnWidth="60" ss:DefaultRowHeight="15">
+				<Column ss:AutoFitWidth="0" ss:Width="103.5"/>
+				<Column ss:AutoFitWidth="0" ss:Width="105"/>
+				<Column ss:AutoFitWidth="0" ss:Width="115"/>
+				<Column ss:AutoFitWidth="0" ss:Width="115"/>
+				<Column ss:AutoFitWidth="0" ss:Width="110"/>
+				<Column ss:AutoFitWidth="0" ss:Width="110"/>
+
+				<Row	ss:AutoFitHeight="0"	ss:Height="15.75">
+					<Cell	ss:MergeAcross="2"	ss:StyleID="s63"><Data ss:Type="String">PARCELLES</Data></Cell>
+					<Cell	ss:MergeAcross="2"	ss:StyleID="s64"><Data ss:Type="String">SUBDIVISION FISCALE</Data></Cell>
+				</Row>
+				<Row ss:AutoFitHeight="0">
+					<Cell	ss:StyleID="s65"><Data ss:Type="String">Parcelle</Data></Cell>
+					<Cell	ss:StyleID="s65"><Data ss:Type="String">Adresse</Data></Cell> 
+					<Cell	ss:StyleID="s65"><Data ss:Type="String">Surface cadastrale (m²)</Data></Cell>
+					<Cell	ss:StyleID="s65"><Data ss:Type="String">Revenu (Euros)</Data></Cell>
+					<Cell	ss:StyleID="s65"><Data ss:Type="String">Surface (m²)</Data></Cell>
+					<Cell	ss:StyleID="s65"><Data ss:Type="String">Occupation</Data></Cell>
+				</Row>
+				<xsl:for-each select="./Mj_Compte_Communal_Parcelles/Mj_Compte_Communal_Parcelle">
+
+					<Row ss:AutoFitHeight="0"> 
+						<Cell><Data ss:Type="String"><xsl:value-of select="./Mj_Parcelle/@idpar" /></Data></Cell>
+						<Cell><Data ss:Type="String"><xsl:value-of select="./Mj_Parcelle/@adresse" /></Data></Cell>
+						<Cell><Data ss:Type="Number"><xsl:value-of select="./Mj_Parcelle/@contenance" /></Data></Cell>
+						<Cell><Data ss:Type="Number"><xsl:value-of select="./@total_revenu_cadastral" /></Data></Cell>
+						<Cell><Data ss:Type="Number"><xsl:value-of select="./@total_contenance" /></Data></Cell>
+						<Cell><Data ss:Type="String"><xsl:value-of select="./Mj_Parcelle/Mj_Suf/@occupation" /></Data></Cell>
+					</Row>
+				</xsl:for-each>
+
+				<Row ss:AutoFitHeight="0">
+					<Cell><Data ss:Type="String">TOTAUX</Data></Cell>
+					<Cell><Data ss:Type="String"></Data></Cell>
+					<Cell><Data ss:Type="Number"><xsl:value-of select="./Mj_Compte_Communal_Parcelles/@Sum_contenance_m2" /></Data></Cell>
+					<Cell><Data ss:Type="Number"><xsl:value-of select="./Mj_Compte_Communal_Parcelles/@Sum_revenu" /></Data></Cell>
+					<Cell><Data ss:Type="Number"><xsl:value-of select="./Mj_Compte_Communal_Parcelles/@Sum_contenance_m2" /></Data></Cell>
+					<Cell><Data ss:Type="String"></Data></Cell>
+				</Row>
+
+			</Table>
+			<WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">
+				<PageSetup>
+					<Header x:Margin="0.3"/>
+					<Footer x:Margin="0.3"/>
+					<PageMargins x:Bottom="0.75" x:Left="0.7" x:Right="0.7" x:Top="0.75"/>
+				</PageSetup>
+				<Unsynced/>
+				<Print>
+					<ValidPrinterInfo/>
+					<PaperSizeIndex>9</PaperSizeIndex>
+					<HorizontalResolution>600</HorizontalResolution>
+					<VerticalResolution>600</VerticalResolution>
+				</Print>
+				<Selected/>
+				<ProtectObjects>False</ProtectObjects>
+				<ProtectScenarios>False</ProtectScenarios>
+			</WorksheetOptions>
+		 </Worksheet>
+	</Workbook>
+</xsl:template>
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/src/module_cadastreV2/web_service/class/majic_libV2/xsl/Mj_fo.xsl b/src/module_cadastreV2/web_service/class/majic_libV2/xsl/Mj_fo.xsl
new file mode 100755
index 0000000000000000000000000000000000000000..dbfa9df57303c23247d4de3a7a75ecabf4449384
--- /dev/null
+++ b/src/module_cadastreV2/web_service/class/majic_libV2/xsl/Mj_fo.xsl
@@ -0,0 +1,2405 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+   <xsl:template match="/">
+      <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+         <fo:layout-master-set>
+            <fo:simple-page-master master-name="simple" page-height="21cm" page-width="29.7cm" margin-top="0.5cm" margin-bottom="0.5cm" margin-left="0.5cm" margin-right="0.5cm">
+               <fo:region-body margin="0.5cm 0 0.5cm 0" />
+            </fo:simple-page-master>
+         </fo:layout-master-set>
+
+         <fo:page-sequence master-reference="simple" font-family="Times">
+<!-- Tableau global bas� sur la structure de la premi�re ligne du relev� de propri�t� -->
+            <fo:flow flow-name="xsl-region-body">
+               <fo:table table-layout="fixed" width="100%" border-collapse="collapse" font-size="7pt">
+                  <fo:table-column column-width="28.7" />
+
+<!-- D�but de l'en-t�te qui se retrouvera sur chaque page du RP -->
+                  <fo:table-header>
+				  <fo:table-row>
+                  <fo:table-cell>
+                  <fo:table table-layout="fixed" width="100%" border-collapse="collapse" font-size="7pt">
+				  <fo:table-column column-width="1.2cm" />
+                  <fo:table-column column-width="0.6cm" />
+                  <fo:table-column column-width="0.6cm" />
+                  <fo:table-column column-width="0.9cm" />
+                  <fo:table-column column-width="0.9cm" />
+                  <fo:table-column column-width="6.4cm" />
+                  <fo:table-column column-width="15.4cm" />
+                  <fo:table-column column-width="1.8cm" />
+                  <fo:table-column column-width="0.9cm" />
+				  <fo:table-body>
+                     <xsl:for-each select="Mj/Mj_Compte_Communal | Mj/Mj_Compte_Communal_Parcelle">
+                        <fo:table-row>
+                           <fo:table-cell border="0.5pt solid black">
+                              <fo:block text-align="center" line-height="0.25cm" vertical-align="middle">ANNEE DE MAJ</fo:block>
+                           </fo:table-cell>
+
+                           <fo:table-cell border="0.5pt solid black">
+                              <fo:block text-align="center" line-height="0.5cm" vertical-align="middle">
+                                 <xsl:value-of select="@annee_de_maj" />
+                              </fo:block>
+                           </fo:table-cell>
+
+                           <fo:table-cell border="0.5pt solid black">
+                              <fo:block text-align="center" line-height="0.25cm" vertical-align="middle">DEP DIR</fo:block>
+                           </fo:table-cell>
+
+                           <fo:table-cell border="0.5pt solid black">
+                              <fo:block text-align="center" line-height="0.5cm" vertical-align="middle">
+                                 <xsl:value-of select="@dep_dir" />
+                              </fo:block>
+                           </fo:table-cell>
+
+                           <fo:table-cell border="0.5pt solid black">
+                              <fo:block text-align="center" line-height="0.5cm" vertical-align="middle">COM</fo:block>
+                           </fo:table-cell>
+
+                           <fo:table-cell border-color="black" border-style="solid" padding-left="0.1cm" border-width="0.5pt">
+                              <fo:block line-height="0.5cm" vertical-align="middle">
+                                 <xsl:value-of select="@com" />
+                              </fo:block>
+                           </fo:table-cell>
+
+                           <fo:table-cell>
+                              <fo:block text-align="center" line-height="0.5cm" vertical-align="middle" font-size="16pt" font-style="italic">RELEVE DE PROPRIETE ( 
+                              <fo:page-number />
+
+                              / 
+                              <fo:page-number-citation ref-id="theEnd" />
+
+                              )</fo:block>
+                           </fo:table-cell>
+
+                           <fo:table-cell border="0.5pt solid black">
+                              <fo:block text-align="center" line-height="0.25cm" vertical-align="middle">NUMERO COMMUNAL</fo:block>
+                           </fo:table-cell>
+
+                           <fo:table-cell border-color="black" border-style="solid" border-width="0.5pt">
+                              <fo:block text-align="center" line-height="0.5cm" vertical-align="middle">
+                                 <xsl:value-of select="@numero_communal" />
+                              </fo:block>
+                           </fo:table-cell>
+                        </fo:table-row>
+                     </xsl:for-each>
+					 </fo:table-body>
+					 </fo:table>
+					 </fo:table-cell>
+                     </fo:table-row>
+
+<!-- Affichage de la ligne titre "PROPRIETAIRE" -->
+                     <fo:table-row>
+                        <fo:table-cell>
+                           <fo:table table-layout="fixed" width="100%" border-collapse="collapse" font-size="7pt">
+                              <fo:table-column column-width="28.7cm" />
+
+                              <fo:table-body>
+                                 <fo:table-row>
+                                    <fo:table-cell padding-top="0.5cm" padding-bottom="0.1cm">
+                                       <fo:block font-size="8pt" text-align="center">PROPRIETAIRE</fo:block>
+                                    </fo:table-cell>
+                                 </fo:table-row>
+                              </fo:table-body>
+                           </fo:table>
+                        </fo:table-cell>
+                     </fo:table-row>
+
+<!-- Affichage du tableau proprietaire -->
+                     <fo:table-row>
+                        <fo:table-cell>
+                           <fo:table table-layout="fixed" border="0.5pt solid black" width="100%" font-size="8pt" >
+                              <fo:table-column column-width="21.7cm" />
+
+                              <fo:table-column column-width="7cm" />
+
+                              <fo:table-body>
+                                 <xsl:for-each select="Mj/Mj_Compte_Communal/Mj_Proprietaire | Mj/Mj_Compte_Communal_Parcelle/Mj_Proprietaire">
+                                    <fo:table-row>
+                                       <fo:table-cell>
+                                          <fo:block>
+                                          <!-- <xsl:value-of select="@l_ccodro" /> -->
+
+                                          � 
+                                          <!-- <xsl:value-of select="@l_ccodem" /> -->
+
+                                          � 
+                                          <xsl:value-of select="@dnuper" />
+
+                                          � 
+                                          <xsl:value-of select="@proprietaire_nom" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell padding-left="0.3cm">
+                                          <fo:block>
+                                             <xsl:value-of select="@jdatnss" />
+                                          </fo:block>
+                                       </fo:table-cell>
+                                    </fo:table-row>
+
+                                    <fo:table-row>
+                                       <fo:table-cell padding-left="0.3cm">
+                                          <fo:block>
+                                             <xsl:value-of select="@proprietaire_adresse" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell>
+                                          <fo:block>
+                                             <xsl:value-of select="@dldnss" />
+                                          </fo:block>
+                                       </fo:table-cell>
+                                    </fo:table-row>
+                                 </xsl:for-each>
+                              </fo:table-body>
+                           </fo:table>
+                        </fo:table-cell>
+                     </fo:table-row>
+                  </fo:table-header>
+
+<!-- Fin de l'en-t�te -->
+<!-- D�but du corps du tableau global -->
+                  <fo:table-body>
+<!-- Affichage des poprietes baties -->
+                     <fo:table-row>
+                        <fo:table-cell>
+                           <fo:table table-layout="fixed" width="100%" border-collapse="collapse" font-size="7pt">
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="1.2cm" />
+
+                              <fo:table-column column-width="1cm" />
+
+                              <fo:table-column column-width="0.4cm" />
+
+                              <fo:table-column column-width="1.2cm" />
+
+                              <fo:table-column column-width="6.4cm" />
+
+                              <fo:table-column column-width="0.9cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="1.2cm" />
+
+                              <fo:table-column column-width="1.8cm" />
+
+                              <fo:table-column column-width="0.7cm" />
+
+                              <fo:table-column column-width="0.7cm" />
+
+                              <fo:table-column column-width="0.4cm" />
+
+                              <fo:table-column column-width="1.2cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="2.4cm" />
+
+                              <fo:table-column column-width="0.7cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="1.8cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="0.7cm" />
+
+<!-- Affichage de l'en-t�te des propri�t�s baties -->
+                              <fo:table-header>
+                                 <fo:table-row>
+                                    <fo:table-cell number-columns-spanned="26" padding-top="1cm" padding-bottom="0.1cm">
+                                       <fo:block text-align="center" font-size="8pt" line-height="0.5cm" vertical-align="middle">PROPRIETES BATIES</fo:block>
+                                    </fo:table-cell>
+                                 </fo:table-row>
+
+                                 <fo:table-row>
+                                    <fo:table-cell number-columns-spanned="7" border="0.5pt solid black">
+                                       <fo:block text-align="center" font-size="8pt" line-height="0.5cm" vertical-align="middle">DESIGNATION DES PROPRIETES</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell number-columns-spanned="5" border="0.5pt solid black" border-left="hidden">
+                                       <fo:block text-align="center" font-size="8pt" line-height="0.5cm" vertical-align="middle">IDENTIFICATION DU LOCAL</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell number-columns-spanned="14" border="0.5pt solid black" border-left="hidden">
+                                       <fo:block text-align="center" font-size="8pt" line-height="0.5cm" vertical-align="middle">EVALUATION DU LOCAL</fo:block>
+                                    </fo:table-cell>
+                                 </fo:table-row>
+
+<!-- Affichage des titres des colonnes des propri�t�s baties -->
+                                 <fo:table-row>
+                                    <fo:table-cell border="0.5pt solid black" >
+                                      <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">AN</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black" >
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">SECTION</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black" >
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">N�PLAN</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black" >
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">CP</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black" >
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">N� Voirie</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black" >
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">ADRESSE</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black"  border-left="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">CODE RIVOLI</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black" >
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">BAT</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black" >
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">ENT</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black" >
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">NIV</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black" >
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">N�PORTE</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black" >
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">N�INVAR</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black" >
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">S TAR</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black" >
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">M EVAL</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black" >
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">AF</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black" >
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">NAT LOC</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black" >
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">CAT</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black" >
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">REVENU CADASTRAL</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black" >
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">COLL</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black" >
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">NAT EXO</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black" >
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">AN RET</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black" >
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">AN DEB</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black" >
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">FRACTION RC EXO</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black" >
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">% EXO</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black" >
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">TX OM</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">COEF</fo:block>
+                                    </fo:table-cell>
+                                 </fo:table-row>
+                              </fo:table-header>
+
+                              <fo:table-footer>
+                                 <fo:table-row>
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+                                 </fo:table-row>
+                              </fo:table-footer>
+
+<!-- Affichage des donn�es des propri�t�s baties -->
+                              <fo:table-body>
+                                 <fo:table-row>
+                                    <fo:table-cell>
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+                                 </fo:table-row>
+
+                                 <xsl:for-each select="Mj/Mj_Compte_Communal/Mj_Bati | Mj/Mj_Compte_Communal_Parcelle/Mj_Bati">
+								 <xsl:sort select="@section" />
+									<xsl:sort select="@num_plan" data-type="number"/>
+                                    <fo:table-row>
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@date" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell padding-right="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="right" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@section" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@num_plan" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@cp" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@voirie" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell padding-left="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@adresse" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-left="hidden" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@code_rivoli" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@bat" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@ent" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@niv" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@num_de_porte" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell padding-left="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@num_invar" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+<!--Affichage du PEV lorsqu'il n'y en a qu'un (m�me ligne) -->
+                                       <xsl:if test="count(Mj_Pev) = 1">
+                                          <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="@s_tar" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="@m_eva" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="@af" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="@nat_loc" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="@cat" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell padding-right="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="right" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="@revenu_cadastral" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="Mj_Pev/Mj_Exone_Pev/@coll" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell padding-right="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="Mj_Pev/@nat_exo" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="Mj_Pev/Mj_Exone_Pev/@an_ret" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="right" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="Mj_Pev/Mj_Exone_Pev/@fraction_rc_exo" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="Mj_Pev/Mj_Exone_Pev/@pourc_exo" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="@tx_om" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             </fo:block>
+                                          </fo:table-cell>
+                                       </xsl:if>
+
+<!--Affichage du premier PEV lorsqu'il y en a plusieurs (m�me ligne) -->
+                                       <xsl:if test="count(Mj_Pev) &gt; 1">
+                                          <xsl:for-each select="Mj_Pev">
+                                             <xsl:if test="position()=1">
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                      <xsl:value-of select="@s_tar" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                      <xsl:value-of select="../@m_eva" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                      <xsl:value-of select="@af" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                      <xsl:value-of select="../@nat_loc" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                      <xsl:value-of select="@cat" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell padding-right="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="right" vertical-align="middle" line-height="0.5cm">
+                                                      <xsl:value-of select="@revenu_cadastral" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                      <xsl:value-of select="@nat_exo" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+                                             </xsl:if>
+                                          </xsl:for-each>
+                                       </xsl:if>
+                                    </fo:table-row>
+
+<!--Affichage des PEV suivants (lignes suivantes) -->
+                                    <xsl:if test="count(Mj_Pev) &gt; 1">
+                                       <xsl:for-each select="Mj_Pev">
+                                          <xsl:if test="position()&gt;1">
+                                             <fo:table-row>
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                      <xsl:value-of select="@s_tar" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                      <xsl:value-of select="../@m_eva" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                      <xsl:value-of select="@af" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                      <xsl:value-of select="../@nat_loc" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                      <xsl:value-of select="@cat" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell padding-right="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="right" vertical-align="middle" line-height="0.25cm">
+                                                      <xsl:value-of select="@revenu_cadastral" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                      <xsl:value-of select="@nat_exo" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+                                             </fo:table-row>
+
+                                             <fo:table-row>
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell padding-right="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="right" vertical-align="middle" line-height="0.25cm">
+                                                      <xsl:value-of select="../@revenu_cadastral" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                      <xsl:value-of select="../@tx_om" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+                                             </fo:table-row>
+                                          </xsl:if>
+                                       </xsl:for-each>
+                                    </xsl:if>
+
+<!--Affichage des Lot_Local s'il y en a -->
+                                    <xsl:if test="count(Mj_Lot_Local) &gt; 0">
+                                       <xsl:for-each select="Mj_Lot_Local">
+                                          <fo:table-row>
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell padding-left="0.4cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block vertical-align="middle" line-height="0.25cm">
+                                                   <xsl:value-of select="@lot" />
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell padding-right="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="right" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+                                          </fo:table-row>
+                                       </xsl:for-each>
+                                    </xsl:if>
+                                 </xsl:for-each>
+                              </fo:table-body>
+                           </fo:table>
+                        </fo:table-cell>
+                     </fo:table-row>
+
+<!-- Affichage du pied du tableau des proprietes baties -->
+                     <fo:table-row>
+                        <fo:table-cell>
+                           <fo:block keep-together="always" keep-with-previous="always">
+                              <fo:table table-layout="fixed" border-collapse="collapse" width="28.7cm" border-color="black" border-right="0.5pt" border-left="0.5pt" border-top="0pt" border-bottom="0.5pt" border-style="solid" font-size="6pt" padding-top="0.2cm" padding-bottom="0.1cm">
+                                 <fo:table-column column-width="1.8cm" />
+
+                                 <fo:table-column column-width="2cm" />
+
+                                 <fo:table-column column-width="2.5cm" />
+
+                                 <fo:table-column column-width="1.5cm" />
+
+                                 <fo:table-column column-width="2cm" />
+
+                                 <fo:table-column column-width="2.5cm" />
+
+                                 <fo:table-column column-width="1.5cm" />
+
+                                 <fo:table-column column-width="2cm" />
+
+                                 <fo:table-column column-width="2.5cm" />
+
+                                 <fo:table-column column-width="1.5cm" />
+
+                                 <fo:table-column column-width="2cm" />
+
+                                 <fo:table-column column-width="6.9cm" />
+
+                                 <fo:table-body>
+                                    <xsl:for-each select="Mj/Mj_Compte_Communal | Mj/Mj_Compte_Communal_Parcelle">
+                                       <fo:table-row>
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell >
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">R EXO</fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">
+                                             <xsl:value-of select="@exo_com_bati_float" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell >
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">R EXO</fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">
+                                             <xsl:value-of select="@exo_dep_bati_float" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell >
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">R EXO</fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">
+                                             <xsl:value-of select="@exo_reg_bati_float" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+                                       </fo:table-row>
+
+                                       <fo:table-row>
+                                          <fo:table-cell>
+                                             <fo:block text-align="left" line-height="0.60cm" vertical-align="middle">REV IMPOSABLE</fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.60cm" vertical-align="middle">
+                                             <xsl:value-of select="@rev_impo_bati_float" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.60cm" vertical-align="middle">COM</fo:block>
+                                          </fo:table-cell>
+
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell >
+                                             <fo:block text-align="right" line-height="0.60cm" vertical-align="middle">DEP</fo:block>
+                                          </fo:table-cell>
+
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.60cm" vertical-align="middle">R</fo:block>
+                                          </fo:table-cell>
+
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+                                       </fo:table-row>
+
+                                       <fo:table-row>
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell >
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle">R IMP</fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle">
+                                             <xsl:value-of select="@rev_impo_com_bati_float" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell >
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle">R IMP</fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle">
+                                             <xsl:value-of select="@rev_impo_dep_bati_float" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell >
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle">R IMP</fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle">
+                                             <xsl:value-of select="@rev_impo_reg_bati_float" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+                                       </fo:table-row>
+                                    </xsl:for-each>
+                                 </fo:table-body>
+                              </fo:table>
+                           </fo:block>
+                        </fo:table-cell>
+                     </fo:table-row>
+
+<!-- Affichage des proprietes non baties -->
+                     <fo:table-row>
+                        <fo:table-cell>
+                           <fo:table table-layout="fixed" width="100%" border-collapse="collapse" font-size="7pt">
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="1.5cm" />
+
+                              <fo:table-column column-width="1.2cm" />
+
+                              <fo:table-column column-width="1.2cm" />
+
+                              <fo:table-column column-width="7.9cm" />
+
+                              <fo:table-column column-width="0.9cm" />
+
+                              <fo:table-column column-width="1.4cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="0.9cm" />
+
+                              <fo:table-column column-width="1.1cm" />
+
+                              <fo:table-column column-width="1cm" />
+
+                              <fo:table-column column-width="0.9cm" />
+
+                              <fo:table-column column-width="0.7cm" />
+
+                              <fo:table-column column-width="0.7cm" />
+
+                              <fo:table-column column-width="0.7cm" />
+
+                              <fo:table-column column-width="2cm" />
+
+                              <fo:table-column column-width="0.9cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="1.5cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+<!-- Affichage de l'en-t�te des proprietes non baties -->
+                              <fo:table-header>
+                                 <fo:table-row>
+                                    <fo:table-cell number-columns-spanned="23" padding-top="1cm" padding-bottom="0.1cm">
+                                       <fo:block text-align="center" font-size="8pt" line-height="0.5cm" vertical-align="middle">PROPRIETES NON BATIES</fo:block>
+                                    </fo:table-cell>
+                                 </fo:table-row>
+
+                                 <fo:table-row>
+                                    <fo:table-cell number-columns-spanned="6" border="0.5pt solid black">
+                                       <fo:block text-align="center" font-size="8pt" line-height="0.5cm" vertical-align="middle">DESIGNATION DES PROPRIETES</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell number-columns-spanned="17" border="0.5pt solid black" border-left="hidden">
+                                       <fo:block text-align="center" font-size="8pt" line-height="0.5cm" vertical-align="middle">EVALUATION</fo:block>
+                                    </fo:table-cell>
+                                 </fo:table-row>
+
+<!-- Affichage des titres des colonnes des proprietes non baties -->
+                                 <fo:table-row>
+                                    <fo:table-cell border="0.5pt solid black">
+                                      <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">AN</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">SECTION</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">N�PLAN</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">N� Voirie</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">ADRESSE</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black" border-left="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">CODE RIVOLIs</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">N�PARC PRIM</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black" border-left="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">FP DP</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black" border-left="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">S TAR</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">SUF</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">GR/SS GR</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">CLASSE</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">NAT CULT</fo:block>
+                                    </fo:table-cell>
+
+<!-- Creation d'une table pour afficher le titre de colonne (CONTENANCE HA A CA) -->
+                                    <fo:table-cell number-columns-spanned="3" border="0.5pt solid black">
+                                       <fo:table table-layout="fixed" border-collapse="collapse" font-size="6pt" width="100%">
+                                          <fo:table-body>
+                                             <fo:table-row>
+                                                <fo:table-cell number-columns-spanned="3" padding-top="0.05cm">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">CONTENANCE</fo:block>
+                                                </fo:table-cell>
+                                             </fo:table-row>
+
+                                             <fo:table-row>
+                                                <fo:table-cell>
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">HA</fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell>
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">A</fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell>
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">CA</fo:block>
+                                                </fo:table-cell>
+                                             </fo:table-row>
+                                          </fo:table-body>
+                                       </fo:table>
+                                    </fo:table-cell>
+
+<!-- Suite de l'affichage des titres des colonnes des proprietes non baties -->
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">REVENU CADASTRAL</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">COLL</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">NAT EXO</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">AN RET</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">FRACTION RC EXO</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">% EXO</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">POS</fo:block>
+                                    </fo:table-cell>
+                                 </fo:table-row>
+                              </fo:table-header>
+
+                              <fo:table-footer>
+                                 <fo:table-row>
+                                    <fo:table-cell border-bottom="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-bottom="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-bottom="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-bottom="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-bottom="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-bottom="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-bottom="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-bottom="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-bottom="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-bottom="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-bottom="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-bottom="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-bottom="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell number-columns-spanned="3" border-bottom="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-bottom="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-bottom="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-bottom="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-bottom="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-bottom="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-bottom="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-bottom="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+                                 </fo:table-row>
+                              </fo:table-footer>
+
+<!-- Affichage des donnees des proprietes non baties -->
+							<fo:table-body>
+								<fo:table-row>
+									<fo:table-cell>
+										<fo:block></fo:block>
+									</fo:table-cell>
+								</fo:table-row>
+
+								<xsl:for-each select="Mj/Mj_Compte_Communal/Mj_Parcelle | Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle">
+									<xsl:sort select="@section" />
+									<xsl:sort select="@num_plan" data-type="number"/>
+									<fo:table-row>
+										<xsl:choose>
+											<xsl:when test="Mj_Suf/@num_voirie = '*****' ">
+												<!-- Premiere ligne si la parcelle est concern�es par un lot en Biens Non d�limit�s -->
+												<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+														<xsl:value-of select="@date" />
+													</fo:block>
+												</fo:table-cell>
+												<fo:table-cell padding-right="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="right" vertical-align="middle" line-height="0.5cm">
+														<xsl:value-of select="@section" />
+													</fo:block>
+												</fo:table-cell>
+												<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+														<xsl:value-of select="@num_plan" />
+													</fo:block>
+												</fo:table-cell>
+												<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+														<xsl:value-of select="@num_voirie" />
+													</fo:block>
+												</fo:table-cell>
+												<fo:table-cell padding-left="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block vertical-align="middle" line-height="0.5cm">
+														<xsl:value-of select="@adresse" />
+													</fo:block>
+												</fo:table-cell>
+												<fo:table-cell padding-left="0.1cm">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+														<xsl:value-of select="@code_rivoli" />
+													</fo:block>
+												</fo:table-cell>
+												<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+														<xsl:value-of select="@num_parc_prim" />
+													</fo:block>
+												</fo:table-cell>
+												<fo:table-cell>
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+														<xsl:value-of select="@fp_dp" />
+													</fo:block>
+												</fo:table-cell>
+												<fo:table-cell>
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm"></fo:block>
+												</fo:table-cell>
+												<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm"></fo:block>
+												</fo:table-cell>
+												<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm"></fo:block>
+												</fo:table-cell>
+												<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm"></fo:block>
+												</fo:table-cell>
+												<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm"></fo:block>
+												</fo:table-cell>
+												<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm"></fo:block>
+												</fo:table-cell>
+												<fo:table-cell>
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm"></fo:block>
+												</fo:table-cell>
+												<fo:table-cell>
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm"></fo:block>
+												</fo:table-cell>
+												<fo:table-cell padding-right="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="right" vertical-align="middle" line-height="0.5cm"></fo:block>
+												</fo:table-cell>
+												<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm"></fo:block>
+												</fo:table-cell>
+												<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm"></fo:block>
+												</fo:table-cell>
+												<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm"></fo:block>
+												</fo:table-cell>
+												<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm"></fo:block>
+												</fo:table-cell>
+												<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm"></fo:block>
+												</fo:table-cell>
+												<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm"></fo:block>
+												</fo:table-cell>
+											</xsl:when>
+											<xsl:otherwise>
+												<!-- Premiere ligne si la parcelle n'est pas concern�e par un lot en Biens Non d�limit�s -->
+												<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+														<xsl:value-of select="@date" />
+													</fo:block>
+												</fo:table-cell>
+												<fo:table-cell padding-right="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="right" vertical-align="middle" line-height="0.5cm">
+														<xsl:value-of select="@section" />
+													</fo:block>
+												</fo:table-cell>
+												<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+														<xsl:value-of select="@num_plan" />
+													</fo:block>
+												</fo:table-cell>
+												<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+														<xsl:value-of select="@num_voirie" />
+													</fo:block>
+												</fo:table-cell>
+												<fo:table-cell padding-left="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block vertical-align="middle" line-height="0.5cm">
+														<xsl:value-of select="@adresse" />
+													</fo:block>
+												</fo:table-cell>
+												<fo:table-cell padding-left="0.1cm">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+														<xsl:value-of select="@code_rivoli" />
+													</fo:block>
+												</fo:table-cell>
+												<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+														<xsl:value-of select="@num_parc_prim" />
+													</fo:block>
+												</fo:table-cell>
+												<fo:table-cell>
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+														<xsl:value-of select="@fp_dp" />
+													</fo:block>
+												</fo:table-cell>
+												<fo:table-cell>
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+														<xsl:value-of select="@s_tar" />
+													</fo:block>
+												</fo:table-cell>
+												<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+														<xsl:value-of select="@suf" />
+													</fo:block>
+												</fo:table-cell>
+												<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+														<xsl:value-of select="@grss_gr" />
+													</fo:block>
+												</fo:table-cell>
+												<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+														<xsl:value-of select="@clas" />
+													</fo:block>
+												</fo:table-cell>
+												<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+														<xsl:value-of select="@nat_cult" />
+													</fo:block>
+												</fo:table-cell>
+												<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+														<xsl:value-of select="@ha" />
+													</fo:block>
+												</fo:table-cell>
+												<fo:table-cell>
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+														<xsl:value-of select="@a" />
+													</fo:block>
+												</fo:table-cell>
+												<fo:table-cell>
+													<fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+														<xsl:value-of select="@ca" />
+													</fo:block>
+												</fo:table-cell>
+												<!-- Affichage de la colonne revenu cadastral lorsqu'il a une seule suf -->
+												<xsl:if test="count(Mj_Suf)=1">
+													<fo:table-cell padding-right="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+														<fo:block text-align="right" vertical-align="middle" line-height="0.5cm">
+															<xsl:value-of select="@revenu_cadastral" />
+														</fo:block>
+													</fo:table-cell>
+												</xsl:if>
+												<!-- Affichage de la colonne revenu cadastral lorsqu'il a plusieurs sufs -->
+												<xsl:if test="count(Mj_Suf) &gt; 1">
+													<fo:table-cell padding-right="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+														<fo:block text-align="right" vertical-align="middle" line-height="0.5cm"></fo:block>
+													</fo:table-cell>
+												</xsl:if>
+												<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+												</fo:table-cell>
+												<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+														<xsl:value-of select="Mj_Suf/@nat_exo" />
+													</fo:block>
+												</fo:table-cell>
+												<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+												</fo:table-cell>
+												<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+												</fo:table-cell>
+												<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+												</fo:table-cell>
+												<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+													<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+												</fo:table-cell>
+											</xsl:otherwise>
+										</xsl:choose>
+									</fo:table-row>
+<!-- Suite de l'affichage des donnees des proprietes non baties - Affichage des SUF-->
+									<xsl:if test="count(Mj_Suf) > 0">
+										<xsl:choose>
+											<xsl:when test="count(Mj_Suf) = 1">
+												<xsl:if test="count(Mj_Suf/Mj_Exon_Suf) > 0">
+													<xsl:for-each select="Mj_Suf/Mj_Exon_Suf">
+														<fo:table-row>
+															<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+															</fo:table-cell>
+															<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+															</fo:table-cell>
+															<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+															</fo:table-cell>
+															<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+															</fo:table-cell>
+															<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+															</fo:table-cell>
+															<fo:table-cell>
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+															</fo:table-cell>
+															<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+															</fo:table-cell>
+															<fo:table-cell>
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+															</fo:table-cell>
+															<fo:table-cell>
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+															</fo:table-cell>
+															<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+															</fo:table-cell>
+															<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+															</fo:table-cell>
+															<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+															</fo:table-cell>
+															<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+															</fo:table-cell>
+															<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+															</fo:table-cell>
+															<fo:table-cell>
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+															</fo:table-cell>
+															<fo:table-cell>
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+															</fo:table-cell>
+															<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																<fo:block text-align="right" vertical-align="middle" line-height="0.25cm"></fo:block>
+															</fo:table-cell>
+															<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+																	<xsl:value-of select="@ccolloc" />
+																</fo:block>
+															</fo:table-cell>
+															<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+																	<xsl:value-of select="@nat_exo" />
+																</fo:block>
+															</fo:table-cell>
+															<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+																	<xsl:value-of select="@pexn div 100" />
+																</fo:block>
+															</fo:table-cell>
+															<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+																	<xsl:value-of select="@rcexnba div 100" />
+																</fo:block>
+															</fo:table-cell>
+															<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+															</fo:table-cell>
+															<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+															</fo:table-cell>
+														</fo:table-row>
+													</xsl:for-each>
+												</xsl:if>
+											</xsl:when>
+											<xsl:otherwise>
+<!-- Affichage des Suf lorsqu'il y en a plusieurs -->
+												<xsl:if test="count(Mj_Suf) &gt; 1">
+													<xsl:for-each select="Mj_Suf">
+														<fo:table-row>
+															<xsl:choose>
+																<xsl:when test="@num_voirie = '*****' ">
+																	<!-- La SUF est concern�e par un lot en Biens Non d�limit�s -->
+																	<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																		<fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+																			<xsl:value-of select="../@date" />
+																		</fo:block>
+																	</fo:table-cell>
+																	<fo:table-cell padding-right="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																		<fo:block text-align="right" vertical-align="middle" line-height="0.5cm">
+																			<xsl:value-of select="../@section" />
+																		</fo:block>
+																	</fo:table-cell>
+																	<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																		<fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+																			<xsl:value-of select="../@num_plan" />
+																		</fo:block>
+																	</fo:table-cell>
+																	<fo:table-cell padding-left="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																		<fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+																			<xsl:value-of select="@num_voirie" />
+																		</fo:block>
+																	</fo:table-cell>
+																	<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																		<fo:block vertical-align="middle" line-height="0.25cm">
+																			<xsl:text>&#160;</xsl:text><xsl:value-of select="@dnupdl" /> LOT <xsl:value-of select="@dnulot" /><xsl:text>&#160;</xsl:text><xsl:value-of select="@dnumql" />/<xsl:value-of select="@ddenql" />
+																		</fo:block>
+																	</fo:table-cell>
+																</xsl:when>
+																<xsl:otherwise>
+																	<!-- La SUF n'est pas concern�e par un lot en Biens Non d�limit�s -->
+																	<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																		<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+																	</fo:table-cell>
+																	<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																		<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+																	</fo:table-cell>
+																	<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																		<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+																	</fo:table-cell>
+																	<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																		<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+																	</fo:table-cell>
+																	<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																		<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+																	</fo:table-cell>
+																</xsl:otherwise>
+															</xsl:choose>
+															<fo:table-cell>
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+															</fo:table-cell>
+															<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+															</fo:table-cell>
+															<fo:table-cell>
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+															</fo:table-cell>
+															<fo:table-cell>
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+																	<xsl:value-of select="@s_tar" />
+																</fo:block>
+															</fo:table-cell>
+															<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+																	<xsl:value-of select="@suf" />
+																</fo:block>
+															</fo:table-cell>
+															<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+																	<xsl:value-of select="@grss_gr" />
+																</fo:block>
+															</fo:table-cell>
+															<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+																	<xsl:value-of select="@clas" />
+																</fo:block>
+															</fo:table-cell>
+															<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+																	<xsl:value-of select="@nat_cult" />
+																</fo:block>
+															</fo:table-cell>
+															<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+																	<xsl:value-of select="@ha" />
+																</fo:block>
+															</fo:table-cell>
+															<fo:table-cell>
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+																	<xsl:value-of select="@a" />
+																</fo:block>
+															</fo:table-cell>
+															<fo:table-cell>
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+																	<xsl:value-of select="@ca" />
+																</fo:block>
+															</fo:table-cell>
+															<fo:table-cell padding-right="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																<fo:block text-align="right" vertical-align="middle" line-height="0.25cm">
+																	<xsl:value-of select="@revenu_cadastral" />
+																</fo:block>
+															</fo:table-cell>
+															<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+															</fo:table-cell>
+															<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+																	<xsl:value-of select="@nat_exo" />
+																</fo:block>
+															</fo:table-cell>
+															<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+															</fo:table-cell>
+															<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+															</fo:table-cell>
+															<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+															</fo:table-cell>
+															<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+															</fo:table-cell>
+														</fo:table-row>
+														<!-- Affichage des Exon_Suf lorsqu'il y en a -->
+														<xsl:if test="count(Mj_Exon_Suf) &gt; 0">
+															<xsl:for-each select="Mj_Exon_Suf">
+																<fo:table-row>
+																	<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																		<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+																	</fo:table-cell>
+																	<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																		<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+																	</fo:table-cell>
+																	<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																		<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+																	</fo:table-cell>
+																	<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																		<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+																	</fo:table-cell>
+																	<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																		<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+																	</fo:table-cell>
+																	<fo:table-cell>
+																		<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+																	</fo:table-cell>
+																	<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																		<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+																	</fo:table-cell>
+																	<fo:table-cell>
+																		<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+																	</fo:table-cell>
+																	<fo:table-cell>
+																		<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+																	</fo:table-cell>
+																	<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																		<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+																	</fo:table-cell>
+																	<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																		<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+																	</fo:table-cell>
+																	<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																		<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+																	</fo:table-cell>
+																	<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																		<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+																	</fo:table-cell>
+																	<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																		<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+																	</fo:table-cell>
+																	<fo:table-cell>
+																		<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+																	</fo:table-cell>
+																	<fo:table-cell>
+																		<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+																	</fo:table-cell>
+																	<fo:table-cell padding-right="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																		<fo:block text-align="right" vertical-align="middle" line-height="0.25cm"></fo:block>
+																	</fo:table-cell>
+																	<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																		<fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+																			<xsl:value-of select="@ccolloc" />
+																		</fo:block>
+																	</fo:table-cell>
+																	<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																		<fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+																			<xsl:value-of select="@nat_exo" />
+																		</fo:block>
+																	</fo:table-cell>
+																	<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																		<fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+																			<xsl:value-of select="@pexn div 100" />
+																		</fo:block>
+																	</fo:table-cell>
+																	<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																		<fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+																			<xsl:value-of select="@rcexnba div 100" />
+																		</fo:block>
+																	</fo:table-cell>
+																	<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																		<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+																	</fo:table-cell>
+																	<fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+																		<fo:block text-align="center" vertical-align="middle" line-height="0.25cm"></fo:block>
+																	</fo:table-cell>
+																</fo:table-row>
+															</xsl:for-each>
+														</xsl:if>
+													</xsl:for-each>
+												</xsl:if>
+											</xsl:otherwise>
+										</xsl:choose>
+									</xsl:if>
+								</xsl:for-each>
+                              </fo:table-body>
+                           </fo:table>
+                        </fo:table-cell>
+                     </fo:table-row>
+
+<!-- Affichage du pied du tableau des proprietes non baties -->
+                     <fo:table-row>
+                        <fo:table-cell>
+                           <fo:block keep-together="always" keep-with-previous="always">
+                              <fo:table width="26.6cm" table-layout="fixed" border-color="black" border-right="0.5pt" border-left="0.5pt" border-top="0pt" border-bottom="0.5pt" border-style="solid" border-collapse="collapse" font-size="6pt" padding-top="0.2cm" padding-bottom="0.1cm">
+                                 <fo:table-column column-width="1cm" />
+                                 <fo:table-column column-width="1cm" />
+                                 <fo:table-column column-width="1cm" />
+                                 <fo:table-column column-width="1cm" />
+                                 <fo:table-column column-width="3.9cm" />
+                                 <fo:table-column column-width="2cm" />
+                                 <fo:table-column column-width="2cm" />
+                                 <fo:table-column column-width="1.5cm" />
+                                 <fo:table-column column-width="2cm" />
+                                 <fo:table-column column-width="2cm" />
+                                 <fo:table-column column-width="1.5cm" />
+                                 <fo:table-column column-width="2cm" />
+                                 <fo:table-column column-width="2cm" />
+                                 <fo:table-column column-width="1.5cm" />
+                                 <fo:table-column column-width="2cm" />
+                                 <fo:table-column column-width="2.3cm" />
+                                 <fo:table-body>
+                                    <xsl:for-each select="Mj/Mj_Compte_Communal | Mj/Mj_Compte_Communal_Parcelle">
+                                       <fo:table-row>
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="center" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">HA</fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="center" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">A</fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="center" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">CA</fo:block>
+                                          </fo:table-cell>
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">R EXO</fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">
+                                             <xsl:value-of select="@exo_com_par_float" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">R EXO</fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">
+                                             <xsl:value-of select="@exo_tax_ad_par_float" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell >
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+                                       </fo:table-row>
+                                       <fo:table-row>
+                                          <fo:table-cell>
+                                             <fo:block text-align="left" line-height="0.60cm" vertical-align="middle">CONT</fo:block>
+                                          </fo:table-cell>
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+									      <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell >
+                                             <fo:block text-align="right" line-height="0.60cm" vertical-align="middle">REV IMPOSABLE</fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.60cm" vertical-align="middle">
+                                             <xsl:value-of select="@rev_impo_par_float" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.60cm" vertical-align="middle">COM</fo:block>
+                                          </fo:table-cell>
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell >
+                                             <fo:block text-align="right" line-height="0.60cm" vertical-align="middle">TAXE AD</fo:block>
+                                          </fo:table-cell>
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell >
+                                             <fo:block text-align="right" line-height="0.60cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell padding-right="0.8cm">
+                                             <fo:block text-align="right" line-height="0.60cm" vertical-align="middle">MAJ POS</fo:block>
+                                          </fo:table-cell>
+                                       </fo:table-row>
+                                       <fo:table-row>
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle">
+                                             </fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="center" line-height="0.20cm" vertical-align="middle">
+                                                <xsl:value-of select="@ha" />
+                                             </fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="center" line-height="0.20cm" vertical-align="middle">
+                                                <xsl:value-of select="@a" />
+                                             </fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="center" line-height="0.20cm" vertical-align="middle">
+                                                <xsl:value-of select="@ca" />
+                                             </fo:block>
+                                          </fo:table-cell>
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle">R IMP</fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle">
+                                             <xsl:value-of select="@rev_impo_com_par_float" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle">R IMP</fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle">
+                                             <xsl:value-of select="@rev_impo_tax_ad_par_float" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+                                       </fo:table-row>
+                                    </xsl:for-each>
+                                 </fo:table-body>
+
+<!-- Fin de la table du pied du tableau des propi�t�s non baties -->
+                              </fo:table>
+                           </fo:block>
+                        </fo:table-cell>
+                     </fo:table-row>
+
+<!-- Fin du corps du tableau global -->
+                  </fo:table-body>
+
+<!-- Fin du tableau global -->
+               </fo:table>
+
+               <fo:block id="theEnd" />
+            </fo:flow>
+         </fo:page-sequence>
+      </fo:root>
+   </xsl:template>
+</xsl:stylesheet>
+
diff --git a/src/module_cadastreV2/web_service/class/majic_libV2/xsl/Mj_fo_Restreint.xsl b/src/module_cadastreV2/web_service/class/majic_libV2/xsl/Mj_fo_Restreint.xsl
new file mode 100755
index 0000000000000000000000000000000000000000..995c9dec18d223052c51cd70615ef2ae056c63c8
--- /dev/null
+++ b/src/module_cadastreV2/web_service/class/majic_libV2/xsl/Mj_fo_Restreint.xsl
@@ -0,0 +1,1791 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+   <xsl:template match="/">
+      <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+         <fo:layout-master-set>
+            <fo:simple-page-master master-name="simple" page-height="21cm" page-width="29.7cm" margin-top="0.5cm" margin-bottom="0.5cm" margin-left="0.5cm" margin-right="0.5cm">
+               <fo:region-body margin="0.5cm 0 0.5cm 0" />
+            </fo:simple-page-master>
+         </fo:layout-master-set>
+
+         <fo:page-sequence master-reference="simple" font-family="Times">
+<!-- Tableau global bas� sur la structure de la premi�re ligne du relev� de propri�t� -->
+            <fo:flow flow-name="xsl-region-body">
+               <fo:table table-layout="fixed" width="100%" border-collapse="collapse" font-size="7pt">
+                  <fo:table-column column-width="28.7" />
+
+<!-- D�but de l'en-t�te qui se retrouvera sur chaque page du RP -->
+                  <fo:table-header>
+				  <fo:table-row>
+                  <fo:table-cell>
+                  <fo:table table-layout="fixed" width="100%" border-collapse="collapse" font-size="7pt">
+				  <fo:table-column column-width="1.2cm" />
+
+                  <fo:table-column column-width="0.6cm" />
+
+                  <fo:table-column column-width="0.6cm" />
+
+                  <fo:table-column column-width="0.9cm" />
+
+                  <fo:table-column column-width="0.9cm" />
+
+                  <fo:table-column column-width="6.4cm" />
+
+                  <fo:table-column column-width="15.4cm" />
+
+                  <fo:table-column column-width="1.8cm" />
+
+                  <fo:table-column column-width="0.9cm" />
+				  <fo:table-body>
+                     <xsl:for-each select="Mj/Mj_Compte_Communal | Mj/Mj_Compte_Communal_Parcelle">
+                        <fo:table-row>
+                           <fo:table-cell border-color="black" border-style="solid" border-right="hidden" border-width="0.5pt">
+                              <fo:block text-align="center" line-height="0.25cm" vertical-align="middle">ANNEE DE MAJ</fo:block>
+                           </fo:table-cell>
+
+                           <fo:table-cell border-color="black" border-style="solid" border-right="hidden" border-width="0.5pt">
+                              <fo:block text-align="center" line-height="0.5cm" vertical-align="middle">
+                                 <xsl:value-of select="@annee_de_maj" />
+                              </fo:block>
+                           </fo:table-cell>
+
+                           <fo:table-cell border-color="black" border-style="solid" border-right="hidden" border-width="0.5pt">
+                              <fo:block text-align="center" line-height="0.25cm" vertical-align="middle">DEP DIR</fo:block>
+                           </fo:table-cell>
+
+                           <fo:table-cell border-color="black" border-style="solid" border-right="hidden" border-width="0.5pt">
+                              <fo:block text-align="center" line-height="0.5cm" vertical-align="middle">
+                                 <xsl:value-of select="@dep_dir" />
+                              </fo:block>
+                           </fo:table-cell>
+
+                           <fo:table-cell border-color="black" border-style="solid" border-right="hidden" border-width="0.5pt">
+                              <fo:block text-align="center" line-height="0.5cm" vertical-align="middle">COM</fo:block>
+                           </fo:table-cell>
+
+                           <fo:table-cell border-color="black" border-style="solid" padding-left="0.1cm" border-width="0.5pt">
+                              <fo:block line-height="0.5cm" vertical-align="middle">
+                                 <xsl:value-of select="@com" />
+                              </fo:block>
+                           </fo:table-cell>
+
+                           <fo:table-cell>
+                              <fo:block text-align="center" line-height="0.5cm" vertical-align="middle" font-size="16pt" font-style="italic">RELEVE DE PROPRIETE ( 
+                              <fo:page-number />
+
+                              / 
+                              <fo:page-number-citation ref-id="theEnd" />
+
+                              )</fo:block>
+                           </fo:table-cell>
+
+                           <fo:table-cell border-color="black" border-style="solid" border-right="hidden" border-width="0.5pt">
+                              <fo:block text-align="center" line-height="0.25cm" vertical-align="middle">NUMERO COMMUNAL</fo:block>
+                           </fo:table-cell>
+
+                           <fo:table-cell border-color="black" border-style="solid" border-width="0.5pt">
+                              <fo:block text-align="center" line-height="0.5cm" vertical-align="middle">
+                                 <xsl:value-of select="substring(@numero_communal,6)" />
+                              </fo:block>
+                           </fo:table-cell>
+                        </fo:table-row>
+                     </xsl:for-each>
+					 </fo:table-body>
+					 </fo:table>
+					 </fo:table-cell>
+                     </fo:table-row>
+
+<!-- Affichage de la ligne titre "PROPRIETAIRE" -->
+                     <fo:table-row>
+                        <fo:table-cell>
+                           <fo:table table-layout="fixed" width="100%" border-collapse="collapse" font-size="7pt">
+                              <fo:table-column column-width="28.7cm" />
+
+                              <fo:table-body>
+                                 <fo:table-row>
+                                    <fo:table-cell padding-top="0.5cm" padding-bottom="0.1cm">
+                                       <fo:block font-size="8pt" text-align="center">PROPRIETAIRE</fo:block>
+                                    </fo:table-cell>
+                                 </fo:table-row>
+                              </fo:table-body>
+                           </fo:table>
+                        </fo:table-cell>
+                     </fo:table-row>
+
+<!-- Affichage du tableau proprietaire -->
+                     <fo:table-row>
+                        <fo:table-cell>
+                           <fo:table table-layout="fixed" border-color="black" border="0.5pt" border-style="solid" border-collapse="collapse" width="100%" font-size="8pt" padding-top="0.2cm" padding-bottom="0.1cm">
+                              <fo:table-column column-width="28.7cm" />
+
+                              
+
+                              <fo:table-body>
+                                 <xsl:for-each select="Mj/Mj_Compte_Communal/Mj_Proprietaire | Mj/Mj_Compte_Communal_Parcelle/Mj_Proprietaire">
+                                    <fo:table-row>
+                                       <fo:table-cell>
+                                          <fo:block>
+                                          <xsl:value-of select="@l_ccodro" />
+
+                                          � 
+                                          <xsl:value-of select="@l_ccodem" />
+
+                                          � 
+                                          <xsl:value-of select="@dnuper" />
+
+                                          � 
+                                          <xsl:value-of select="@proprietaire_nom_tiers" />
+                                          </fo:block>
+                                       </fo:table-cell>
+                                    </fo:table-row>
+
+                                    <fo:table-row>
+                                       <fo:table-cell padding-left="0.3cm">
+                                          <fo:block>
+                                             <xsl:value-of select="@proprietaire_adresse" />
+                                          </fo:block>
+                                       </fo:table-cell>
+                                    </fo:table-row>
+                                 </xsl:for-each>
+                              </fo:table-body>
+                           </fo:table>
+                        </fo:table-cell>
+                     </fo:table-row>
+                  </fo:table-header>
+
+<!-- Fin de l'en-t�te -->
+<!-- D�but du corps du tableau global -->
+                  <fo:table-body>
+<!-- Affichage des poprietes baties -->
+                     <fo:table-row>
+                        <fo:table-cell>
+                           <fo:table table-layout="fixed" width="100%" border-collapse="collapse" font-size="7pt">
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="1.2cm" />
+
+                              <fo:table-column column-width="1cm" />
+
+                              <fo:table-column column-width="0.4cm" />
+
+                              <fo:table-column column-width="1.2cm" />
+
+                              <fo:table-column column-width="11.3cm" />
+
+                              <fo:table-column column-width="0.9cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="1.2cm" />
+
+                              <fo:table-column column-width="1.8cm" />
+
+                              <fo:table-column column-width="0.7cm" />
+
+                              <fo:table-column column-width="0.7cm" />
+
+                              <fo:table-column column-width="0.4cm" />
+
+                              <fo:table-column column-width="1.2cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="2.4cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="0.7cm" />
+
+<!-- Affichage de l'en-t�te des propri�t�s baties -->
+                              <fo:table-header>
+                                 <fo:table-row>
+                                    <fo:table-cell border-color="black" border-style="solid" number-columns-spanned="20" border-left="hidden" border-right="hidden" border-top="hidden" border-bottom="hidden" border-width="0.5pt" padding-top="1cm" padding-bottom="0.1cm">
+                                       <fo:block text-align="center" font-size="8pt" line-height="0.5cm" vertical-align="middle">PROPRIETES BATIES</fo:block>
+                                    </fo:table-cell>
+                                 </fo:table-row>
+
+                                 <fo:table-row>
+                                    <fo:table-cell border-color="black" border-style="solid" number-columns-spanned="7" border-right="hidden" border-bottom="hidden" border-width="0.5pt">
+                                       <fo:block text-align="center" font-size="8pt" line-height="0.5cm" vertical-align="middle">DESIGNATION DES PROPRIETES</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-style="solid" number-columns-spanned="5" border-left="hidden" border-bottom="hidden" border-right="hidden" border-width="0.5pt">
+                                       <fo:block text-align="center" font-size="8pt" line-height="0.5cm" vertical-align="middle">IDENTIFICATION DU LOCAL</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-style="solid" number-columns-spanned="8" border-left="hidden" border-bottom="hidden" border-width="0.5pt">
+                                       <fo:block text-align="center" font-size="8pt" line-height="0.5cm" vertical-align="middle">EVALUATION DU LOCAL</fo:block>
+                                    </fo:table-cell>
+                                 </fo:table-row>
+
+<!-- Affichage des titres des colonnes des propri�t�s baties -->
+                                 <fo:table-row>
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden">
+                                      <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">AN</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">SECTION</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">N�PLAN</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">CP</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">N� Voirie</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">ADRESSE</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-left="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">CODE RIVOLI</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">BAT</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">ENT</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">NIV</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">N�PORTE</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">N�INVAR</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">S TAR</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">M EVAL</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">AF</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">NAT LOC</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">CAT</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">REVENU CADASTRAL</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">TX OM</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">COEF</fo:block>
+                                    </fo:table-cell>
+                                 </fo:table-row>
+                              </fo:table-header>
+
+                              <fo:table-footer>
+                                 <fo:table-row>
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+                                 </fo:table-row>
+                              </fo:table-footer>
+
+<!-- Affichage des donn�es des propri�t�s baties -->
+                              <fo:table-body>
+                                 <fo:table-row>
+                                    <fo:table-cell>
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+                                 </fo:table-row>
+
+                                 <xsl:for-each select="Mj/Mj_Compte_Communal/Mj_Bati | Mj/Mj_Compte_Communal_Parcelle/Mj_Bati">
+								  <xsl:sort select="@section" />
+									<xsl:sort select="@num_plan" data-type="number"/>
+                                    <fo:table-row>
+                                       <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@date" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell padding-right="0.1cm" border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="right" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@section" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@num_plan" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@cp" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@voirie" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell padding-left="0.1cm" border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                          <fo:block vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@adresse" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-left="hidden" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@code_rivoli" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@bat" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@ent" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@niv" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@num_de_porte" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell padding-left="0.1cm" border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                          <fo:block vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@num_invar" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+<!--Affichage du PEV lorsqu'il n'y en a qu'un (m�me ligne) -->
+                                       <xsl:if test="count(Mj_Pev) = 1">
+                                          <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="@s_tar" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="@m_eva" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="@af" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="@nat_loc" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="@cat" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell padding-right="0.1cm" border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="right" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="@revenu_cadastral" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="@tx_om" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             </fo:block>
+                                          </fo:table-cell>
+                                       </xsl:if>
+
+<!--Affichage du premier PEV lorsqu'il y en a plusieurs (m�me ligne) -->
+                                       <xsl:if test="count(Mj_Pev) &gt; 1">
+                                          <xsl:for-each select="Mj_Pev">
+                                             <xsl:if test="position()=1">
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                      <xsl:value-of select="@s_tar" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                      <xsl:value-of select="../@m_eva" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                      <xsl:value-of select="@af" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                      <xsl:value-of select="../@nat_loc" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                      <xsl:value-of select="@cat" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell padding-right="0.1cm" border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="right" vertical-align="middle" line-height="0.5cm">
+                                                      <xsl:value-of select="@revenu_cadastral" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+                                             </xsl:if>
+                                          </xsl:for-each>
+                                       </xsl:if>
+                                    </fo:table-row>
+
+<!--Affichage des PEV suivants (lignes suivantes) -->
+                                    <xsl:if test="count(Mj_Pev) &gt; 1">
+                                       <xsl:for-each select="Mj_Pev">
+                                          <xsl:if test="position()&gt;1">
+                                             <fo:table-row>
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                      <xsl:value-of select="@s_tar" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                      <xsl:value-of select="../@m_eva" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                      <xsl:value-of select="@af" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                      <xsl:value-of select="../@nat_loc" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                      <xsl:value-of select="@cat" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell padding-right="0.1cm" border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="right" vertical-align="middle" line-height="0.25cm">
+                                                      <xsl:value-of select="@revenu_cadastral" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+                                             </fo:table-row>
+
+                                             <fo:table-row>
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell padding-right="0.1cm" border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="right" vertical-align="middle" line-height="0.25cm">
+                                                      <xsl:value-of select="../@revenu_cadastral" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                      <xsl:value-of select="../@tx_om" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+                                             </fo:table-row>
+                                          </xsl:if>
+                                       </xsl:for-each>
+                                    </xsl:if>
+
+<!--Affichage des Lot_Local s'il y en a -->
+                                    <xsl:if test="count(Mj_Lot_Local) &gt; 0">
+                                       <xsl:for-each select="Mj_Lot_Local">
+                                          <fo:table-row>
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell padding-left="0.4cm" border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                <fo:block vertical-align="middle" line-height="0.25cm">
+                                                   <xsl:value-of select="@lot" />
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell padding-right="0.1cm" border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="right" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+                                          </fo:table-row>
+                                       </xsl:for-each>
+                                    </xsl:if>
+                                 </xsl:for-each>
+                              </fo:table-body>
+                           </fo:table>
+                        </fo:table-cell>
+                     </fo:table-row>
+
+<!-- Affichage du pied du tableau des proprietes baties -->
+                     <fo:table-row>
+                        <fo:table-cell>
+                           <fo:block keep-together="always" keep-with-previous="always">
+                              <fo:table table-layout="fixed" border-collapse="collapse" width="28.7cm" border-color="black" border-right="0.5pt" border-left="0.5pt" border-top="0pt" border-bottom="0.5pt" border-style="solid" font-size="6pt" padding-top="0.2cm" padding-bottom="0.1cm">
+                                 <fo:table-column column-width="1.8cm" />
+
+                                 <fo:table-column column-width="2cm" />
+
+                                 <fo:table-column column-width="2.5cm" />
+
+                                 <fo:table-column column-width="1.5cm" />
+
+                                 <fo:table-column column-width="2cm" />
+
+                                 <fo:table-column column-width="2.5cm" />
+
+                                 <fo:table-column column-width="1.5cm" />
+
+                                 <fo:table-column column-width="2cm" />
+
+                                 <fo:table-column column-width="2.5cm" />
+
+                                 <fo:table-column column-width="1.5cm" />
+
+                                 <fo:table-column column-width="2cm" />
+
+                                 <fo:table-column column-width="6.9cm" />
+
+                                 <fo:table-body>
+                                    <xsl:for-each select="Mj/Mj_Compte_Communal | Mj/Mj_Compte_Communal_Parcelle">
+                                       
+                                       <fo:table-row>
+                                          <fo:table-cell>
+                                             <fo:block text-align="left" line-height="0.60cm" vertical-align="middle">REV IMPOSABLE</fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.60cm" vertical-align="middle">
+                                             <xsl:value-of select="@rev_impo_bati_float" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.60cm" vertical-align="middle">COM</fo:block>
+                                          </fo:table-cell>
+										  
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+										  
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell >
+                                             <fo:block text-align="right" line-height="0.60cm" vertical-align="middle">DEP</fo:block>
+                                          </fo:table-cell>
+										  
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+										  
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.60cm" vertical-align="middle">R</fo:block>
+                                          </fo:table-cell>
+										  
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+										  
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+										  
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+                                       </fo:table-row>
+
+                                       <fo:table-row>
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+										  
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+										  
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+										  
+                                          <fo:table-cell >
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle">R IMP</fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle">
+                                             <xsl:value-of select="@rev_impo_com_bati_float" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+										  
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell >
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle">R IMP</fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle">
+                                             <xsl:value-of select="@rev_impo_dep_bati_float" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+										  
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell >
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle">R IMP</fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle">
+                                             <xsl:value-of select="@rev_impo_reg_bati_float" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+										  
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+                                       </fo:table-row>
+                                    </xsl:for-each>
+                                 </fo:table-body>
+                              </fo:table>
+                           </fo:block>
+                        </fo:table-cell>
+                     </fo:table-row>
+
+<!-- Affichage des proprietes non baties -->
+                     <fo:table-row>
+                        <fo:table-cell>
+                           <fo:table table-layout="fixed" width="100%" border-collapse="collapse" font-size="7pt">
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="1.5cm" />
+
+                              <fo:table-column column-width="1.2cm" />
+
+                              <fo:table-column column-width="1.2cm" />
+
+                              <fo:table-column column-width="12.1cm" />
+
+                              <fo:table-column column-width="0.9cm" />
+
+                              <fo:table-column column-width="1.4cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="0.9cm" />
+
+                              <fo:table-column column-width="1.1cm" />
+
+                              <fo:table-column column-width="1cm" />
+
+                              <fo:table-column column-width="0.9cm" />
+
+                              <fo:table-column column-width="0.7cm" />
+
+                              <fo:table-column column-width="0.7cm" />
+
+                              <fo:table-column column-width="0.7cm" />
+
+                              <fo:table-column column-width="2cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+<!-- Affichage de l'en-t�te des proprietes non baties -->
+                              <fo:table-header>
+                                 <fo:table-row>
+                                    <fo:table-cell border-color="black" border-style="solid" number-columns-spanned="18" border-right="hidden" border-bottom="hidden" border-left="hidden" border-top="hidden" border-width="0.5pt" padding-top="1cm" padding-bottom="0.1cm">
+                                       <fo:block text-align="center" font-size="8pt" line-height="0.5cm" vertical-align="middle">PROPRIETES NON BATIES</fo:block>
+                                    </fo:table-cell>
+                                 </fo:table-row>
+
+                                 <fo:table-row>
+                                    <fo:table-cell border-color="black" border-style="solid" number-columns-spanned="6" border-right="hidden" border-bottom="hidden" border-width="0.5pt">
+                                       <fo:block text-align="center" font-size="8pt" line-height="0.5cm" vertical-align="middle">DESIGNATION DES PROPRIETES</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-style="solid" number-columns-spanned="12" border-left="hidden" border-bottom="hidden" border-width="0.5pt">
+                                       <fo:block text-align="center" font-size="8pt" line-height="0.5cm" vertical-align="middle">EVALUATION</fo:block>
+                                    </fo:table-cell>
+                                 </fo:table-row>
+
+<!-- Affichage des titres des colonnes des proprietes non baties -->
+                                 <fo:table-row>
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden">
+                                      <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">AN</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">SECTION</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">N�PLAN</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">N� Voirie</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">ADRESSE</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-left="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">CODE RIVOLI</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">N�PARC PRIM</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-left="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">FP DP</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-left="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">S TAR</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">SUF</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">GR/SS GR</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">CLASSE</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">NAT CULT</fo:block>
+                                    </fo:table-cell>
+
+<!-- Creation d'une table pour afficher le titre de colonne (CONTENANCE HA A CA) -->
+                                    <fo:table-cell number-columns-spanned="3" border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden">
+                                       <fo:table table-layout="fixed" border-collapse="collapse" font-size="6pt" width="100%">
+                                          <fo:table-body>
+                                             <fo:table-row>
+                                                <fo:table-cell number-columns-spanned="3" padding-top="0.05cm">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">CONTENANCE</fo:block>
+                                                </fo:table-cell>
+                                             </fo:table-row>
+
+                                             <fo:table-row>
+                                                <fo:table-cell>
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">HA</fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell>
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">A</fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell>
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">CA</fo:block>
+                                                </fo:table-cell>
+                                             </fo:table-row>
+                                          </fo:table-body>
+                                       </fo:table>
+                                    </fo:table-cell>
+
+<!-- Suite de l'affichage des titres des colonnes des proprietes non baties -->
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">REVENU CADASTRAL</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">POS</fo:block>
+                                    </fo:table-cell>
+                                 </fo:table-row>
+                              </fo:table-header>
+
+                              <fo:table-footer>
+                                 <fo:table-row>
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell number-columns-spanned="3" border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-left="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+                                 </fo:table-row>
+                              </fo:table-footer>
+
+<!-- Affichage des donnees des proprietes non baties -->
+                              <fo:table-body>
+                                 <fo:table-row>
+                                    <fo:table-cell>
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+                                 </fo:table-row>
+
+                                 <xsl:for-each select="Mj/Mj_Compte_Communal/Mj_Parcelle | Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle">
+								  <xsl:sort select="@section" />
+									<xsl:sort select="@num_plan" data-type="number"/>
+                                    <fo:table-row>
+                                       <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@date" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell padding-right="0.1cm" border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="right" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@section" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@num_plan" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@num_voirie" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell padding-left="0.1cm" border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                          <fo:block vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@adresse" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell padding-left="0.1cm" border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@code_rivoli" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@num_parc_prim" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@fp_dp" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@s_tar" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@suf" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@grss_gr" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@clas" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@nat_cult" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@ha" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@a" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@ca" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+<!-- Affichage de la colonne revenu cadastral lorsqu'il a une seule suf -->
+                                       <xsl:if test="count(Mj_Suf)=1">
+                                          <fo:table-cell padding-right="0.1cm" border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="right" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="@revenu_cadastral" />
+                                             </fo:block>
+                                          </fo:table-cell>
+                                       </xsl:if>
+
+<!-- Affichage de la colonne revenu cadastral lorsqu'il a plusieurs sufs -->
+                                       <xsl:if test="count(Mj_Suf) &gt; 1">
+                                          <fo:table-cell padding-right="0.1cm" border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="right" vertical-align="middle" line-height="0.5cm">
+                                             </fo:block>
+                                          </fo:table-cell>
+                                       </xsl:if>
+
+<!-- Suite de l'affichage des donnees des proprietes non baties -->
+                                       <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                          </fo:block>
+                                       </fo:table-cell>
+                                    </fo:table-row>
+
+<!-- Affichage des Suf lorsqu'il y en a plusieurs -->
+                                    <xsl:if test="count(Mj_Suf) &gt; 1">
+                                       <xsl:for-each select="Mj_Suf">
+                                          <fo:table-row>
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   <xsl:value-of select="@s_tar" />
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   <xsl:value-of select="@suf" />
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   <xsl:value-of select="@grss_gr" />
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   <xsl:value-of select="@clas" />
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   <xsl:value-of select="@nat_cult" />
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   <xsl:value-of select="@ha" />
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   <xsl:value-of select="@a" />
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   <xsl:value-of select="@ca" />
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell padding-right="0.1cm" border-color="black" border-width="0.5pt" border-style="solid" border-right="hidden" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="right" vertical-align="middle" line-height="0.25cm">
+                                                   <xsl:value-of select="@revenu_cadastral" />
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border-color="black" border-width="0.5pt" border-style="solid" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+                                          </fo:table-row>
+                                       </xsl:for-each>
+                                    </xsl:if>
+                                 </xsl:for-each>
+                              </fo:table-body>
+                           </fo:table>
+                        </fo:table-cell>
+                     </fo:table-row>
+
+<!-- Affichage du pied du tableau des proprietes non baties -->
+                     <fo:table-row>
+                        <fo:table-cell>
+                           <fo:block keep-together="always" keep-with-previous="always">
+                              <fo:table width="26.6cm" table-layout="fixed" border-color="black" border-right="0.5pt" border-left="0.5pt" border-top="0pt" border-bottom="0.5pt" border-style="solid" border-collapse="collapse" font-size="6pt" padding-top="0.2cm" padding-bottom="0.1cm">
+                                 <fo:table-column column-width="1cm" />
+
+                                 <fo:table-column column-width="1cm" />
+
+                                 <fo:table-column column-width="1cm" />
+
+                                 <fo:table-column column-width="1cm" />
+
+                                 <fo:table-column column-width="3.9cm" />
+
+                                 <fo:table-column column-width="2cm" />
+
+                                 <fo:table-column column-width="2cm" />
+
+                                 <fo:table-column column-width="1.5cm" />
+
+                                 <fo:table-column column-width="2cm" />
+
+                                 <fo:table-column column-width="2cm" />
+
+                                 <fo:table-column column-width="1.5cm" />
+
+                                 <fo:table-column column-width="2cm" />
+
+                                 <fo:table-column column-width="2cm" />
+
+                                 <fo:table-column column-width="1.5cm" />
+
+                                 <fo:table-column column-width="2cm" />
+
+                                 <fo:table-column column-width="2.3cm" />
+
+                                 <fo:table-body>
+                                    <xsl:for-each select="Mj/Mj_Compte_Communal | Mj/Mj_Compte_Communal_Parcelle">
+                                       <fo:table-row>
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle">
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="center" line-height="0.20cm" vertical-align="middle">HA</fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="center" line-height="0.20cm" vertical-align="middle">A</fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="center" line-height="0.20cm" vertical-align="middle">CA</fo:block>
+                                          </fo:table-cell>
+										  
+										  
+                                       </fo:table-row>
+
+                                       <fo:table-row>
+                                          <fo:table-cell>
+                                             <fo:block text-align="left" line-height="0.60cm" vertical-align="middle">CONT</fo:block>
+                                          </fo:table-cell>
+										  
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+										  
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+										  
+									      <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell >
+                                             <fo:block text-align="right" line-height="0.60cm" vertical-align="middle">REV IMPOSABLE</fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.60cm" vertical-align="middle">
+                                             <xsl:value-of select="@rev_impo_par_float" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.60cm" vertical-align="middle">COM</fo:block>
+                                          </fo:table-cell>
+										  
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+										  
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell >
+                                             <fo:block text-align="right" line-height="0.60cm" vertical-align="middle">TAXE AD</fo:block>
+                                          </fo:table-cell>
+										  
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+										  
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell >
+                                             <fo:block text-align="right" line-height="0.60cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+										  
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+										  
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell padding-right="0.8cm">
+                                             <fo:block text-align="right" line-height="0.60cm" vertical-align="middle">MAJ POS</fo:block>
+                                          </fo:table-cell>
+                                       </fo:table-row>
+
+                                       <fo:table-row>
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle">
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="center" line-height="0.20cm" vertical-align="middle">
+                                                <xsl:value-of select="@ha" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="center" line-height="0.20cm" vertical-align="middle">
+                                                <xsl:value-of select="@a" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="center" line-height="0.20cm" vertical-align="middle">
+                                                <xsl:value-of select="@ca" />
+                                             </fo:block>
+                                          </fo:table-cell>
+										  
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+										  
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+										  
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle">R IMP</fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle">
+                                             <xsl:value-of select="@rev_impo_com_par_float" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+										  
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle">R IMP</fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle">
+                                             <xsl:value-of select="@rev_impo_tax_ad_par_float" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+										  
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle">
+											</fo:block>
+                                          </fo:table-cell>
+										  
+										  <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+                                       </fo:table-row>
+                                    </xsl:for-each>
+                                 </fo:table-body>
+
+<!-- Fin de la table du pied du tableau des propi�t�s non baties -->
+                              </fo:table>
+                           </fo:block>
+                        </fo:table-cell>
+                     </fo:table-row>
+
+<!-- Fin du corps du tableau global -->
+                  </fo:table-body>
+
+<!-- Fin du tableau global -->
+               </fo:table>
+
+               <fo:block id="theEnd" />
+            </fo:flow>
+         </fo:page-sequence>
+      </fo:root>
+   </xsl:template>
+</xsl:stylesheet>
+
diff --git a/src/module_cadastreV2/web_service/class/majic_libV2/xsl/Mj_fo_tiers.xsl b/src/module_cadastreV2/web_service/class/majic_libV2/xsl/Mj_fo_tiers.xsl
new file mode 100755
index 0000000000000000000000000000000000000000..cd17f9b12e26db5237f4f795c440754ef83974fb
--- /dev/null
+++ b/src/module_cadastreV2/web_service/class/majic_libV2/xsl/Mj_fo_tiers.xsl
@@ -0,0 +1,2037 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+   <xsl:template match="/">
+      <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+         <fo:layout-master-set>
+            <fo:simple-page-master master-name="simple" page-height="21cm" page-width="29.7cm" margin-top="0.5cm" margin-bottom="0.5cm" margin-left="0.5cm" margin-right="0.5cm">
+               <fo:region-body margin="0.5cm 0 0.5cm 0" />
+            </fo:simple-page-master>
+         </fo:layout-master-set>
+
+         <fo:page-sequence master-reference="simple" font-family="Times">
+<!-- Tableau global bas� sur la structure de la premi�re ligne du relev� de propri�t� -->
+            <fo:flow flow-name="xsl-region-body">
+               <fo:table table-layout="fixed" width="100%" border-collapse="collapse" font-size="7pt">
+                  <fo:table-column column-width="28.7" />
+
+<!-- D�but de l'en-t�te qui se retrouvera sur chaque page du RP -->
+                  <fo:table-header>
+				  <fo:table-row>
+                  <fo:table-cell>
+                  <fo:table table-layout="fixed" width="100%" border-collapse="collapse" font-size="7pt">
+				  <fo:table-column column-width="1.2cm" />
+                  <fo:table-column column-width="0.6cm" />
+                  <fo:table-column column-width="0.6cm" />
+                  <fo:table-column column-width="0.9cm" />
+                  <fo:table-column column-width="0.9cm" />
+                  <fo:table-column column-width="6.4cm" />
+                  <fo:table-column column-width="15.4cm" />
+                  <fo:table-column column-width="1.8cm" />
+                  <fo:table-column column-width="0.9cm" />
+				  <fo:table-body>
+                     <xsl:for-each select="Mj/Mj_Compte_Communal | Mj/Mj_Compte_Communal_Parcelle">
+                        <fo:table-row>
+                           <fo:table-cell border="0.5pt solid black">
+                              <fo:block text-align="center" line-height="0.25cm" vertical-align="middle">ANNEE DE MAJ</fo:block>
+                           </fo:table-cell>
+
+                           <fo:table-cell border="0.5pt solid black">
+                              <fo:block text-align="center" line-height="0.5cm" vertical-align="middle">
+                                 <xsl:value-of select="@annee_de_maj" />
+                              </fo:block>
+                           </fo:table-cell>
+
+                           <fo:table-cell border="0.5pt solid black">
+                              <fo:block text-align="center" line-height="0.25cm" vertical-align="middle">DEP DIR</fo:block>
+                           </fo:table-cell>
+
+                           <fo:table-cell border="0.5pt solid black">
+                              <fo:block text-align="center" line-height="0.5cm" vertical-align="middle">
+                                 <xsl:value-of select="@dep_dir" />
+                              </fo:block>
+                           </fo:table-cell>
+
+                           <fo:table-cell border="0.5pt solid black">
+                              <fo:block text-align="center" line-height="0.5cm" vertical-align="middle">COM</fo:block>
+                           </fo:table-cell>
+
+                           <fo:table-cell border-color="black" border-style="solid" padding-left="0.1cm" border-width="0.5pt">
+                              <fo:block line-height="0.5cm" vertical-align="middle">
+                                 <xsl:value-of select="@com" />
+                              </fo:block>
+                           </fo:table-cell>
+
+                           <fo:table-cell>
+                              <fo:block text-align="center" line-height="0.5cm" vertical-align="middle" font-size="16pt" font-style="italic">RELEVE DE PROPRIETE ( 
+                              <fo:page-number />
+
+                              / 
+                              <fo:page-number-citation ref-id="theEnd" />
+
+                              )</fo:block>
+                           </fo:table-cell>
+
+                           <fo:table-cell border="0.5pt solid black">
+                              <fo:block text-align="center" line-height="0.25cm" vertical-align="middle">NUMERO COMMUNAL</fo:block>
+                           </fo:table-cell>
+
+                           <fo:table-cell border-color="black" border-style="solid" border-width="0.5pt">
+                              <fo:block text-align="center" line-height="0.5cm" vertical-align="middle">
+                                 <xsl:value-of select="@numero_communal" />
+                              </fo:block>
+                           </fo:table-cell>
+                        </fo:table-row>
+                     </xsl:for-each>
+					 </fo:table-body>
+					 </fo:table>
+					 </fo:table-cell>
+                     </fo:table-row>
+
+<!-- Affichage de la ligne titre "PROPRIETAIRE" -->
+                     <fo:table-row>
+                        <fo:table-cell>
+                           <fo:table table-layout="fixed" width="100%" border-collapse="collapse" font-size="7pt">
+                              <fo:table-column column-width="28.7cm" />
+
+                              <fo:table-body>
+                                 <fo:table-row>
+                                    <fo:table-cell padding-top="0.5cm" padding-bottom="0.1cm">
+                                       <fo:block font-size="8pt" text-align="center">PROPRIETAIRE</fo:block>
+                                    </fo:table-cell>
+                                 </fo:table-row>
+                              </fo:table-body>
+                           </fo:table>
+                        </fo:table-cell>
+                     </fo:table-row>
+
+<!-- Affichage du tableau proprietaire -->
+                     <fo:table-row>
+                        <fo:table-cell>
+                           <fo:table table-layout="fixed" border-color="black" border="0.5pt" border-style="solid" border-collapse="collapse" width="100%" font-size="8pt" padding-top="0.2cm" padding-bottom="0.1cm">
+                              <fo:table-column column-width="21.7cm" />
+
+                              <fo:table-column column-width="7cm" />
+
+                              <fo:table-body>
+                                 <xsl:for-each select="Mj/Mj_Compte_Communal/Mj_Proprietaire | Mj/Mj_Compte_Communal_Parcelle/Mj_Proprietaire">
+                                    <fo:table-row>
+                                       <fo:table-cell>
+                                          <fo:block>
+                                          <!-- <xsl:value-of select="@l_ccodro" /> -->
+
+                                          � 
+                                          <!-- <xsl:value-of select="@l_ccodem" /> -->
+
+                                          � 
+                                          <xsl:value-of select="@dnuper" />
+
+<!-- Modification tiers par rapport au xsl par d�faut-->
+                                          � 
+                                          <xsl:value-of select="@proprietaire_nom_tiers" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell padding-left="0.3cm">
+                                          <fo:block>
+<!-- Modification tiers par rapport au xsl par d�faut-->
+                                          </fo:block>
+                                       </fo:table-cell>
+                                    </fo:table-row>
+
+                                    <fo:table-row>
+                                       <fo:table-cell padding-left="0.3cm">
+                                          <fo:block>
+                                             <xsl:value-of select="@proprietaire_adresse" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell>
+                                          <fo:block>
+<!-- Modification tiers par rapport au xsl par d�faut-->
+                                          </fo:block>
+                                       </fo:table-cell>
+                                    </fo:table-row>
+                                 </xsl:for-each>
+                              </fo:table-body>
+                           </fo:table>
+                        </fo:table-cell>
+                     </fo:table-row>
+                  </fo:table-header>
+
+<!-- Fin de l'en-t�te -->
+<!-- D�but du corps du tableau global -->
+                  <fo:table-body>
+<!-- Affichage des poprietes baties -->
+                     <fo:table-row>
+                        <fo:table-cell>
+                           <fo:table table-layout="fixed" width="100%" border-collapse="collapse" font-size="7pt">
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="1.2cm" />
+
+                              <fo:table-column column-width="1cm" />
+
+                              <fo:table-column column-width="0.4cm" />
+
+                              <fo:table-column column-width="1.2cm" />
+
+                              <fo:table-column column-width="6.4cm" />
+
+                              <fo:table-column column-width="0.9cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="1.2cm" />
+
+                              <fo:table-column column-width="1.8cm" />
+
+                              <fo:table-column column-width="0.7cm" />
+
+                              <fo:table-column column-width="0.7cm" />
+
+                              <fo:table-column column-width="0.4cm" />
+
+                              <fo:table-column column-width="1.2cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="2.4cm" />
+
+                              <fo:table-column column-width="0.7cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="1.8cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="0.7cm" />
+
+<!-- Affichage de l'en-t�te des propri�t�s baties -->
+                              <fo:table-header>
+                                 <fo:table-row>
+                                    <fo:table-cell number-columns-spanned="26" padding-top="1cm" padding-bottom="0.1cm">
+                                       <fo:block text-align="center" font-size="8pt" line-height="0.5cm" vertical-align="middle">PROPRIETES BATIES</fo:block>
+                                    </fo:table-cell>
+                                 </fo:table-row>
+
+                                 <fo:table-row>
+                                    <fo:table-cell number-columns-spanned="7" border="0.5pt solid black">
+                                       <fo:block text-align="center" font-size="8pt" line-height="0.5cm" vertical-align="middle">DESIGNATION DES PROPRIETES</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell number-columns-spanned="5" border="0.5pt solid black" border-left="hidden">
+                                       <fo:block text-align="center" font-size="8pt" line-height="0.5cm" vertical-align="middle">IDENTIFICATION DU LOCAL</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell number-columns-spanned="14" border="0.5pt solid black" border-left="hidden">
+                                       <fo:block text-align="center" font-size="8pt" line-height="0.5cm" vertical-align="middle">EVALUATION DU LOCAL</fo:block>
+                                    </fo:table-cell>
+                                 </fo:table-row>
+
+<!-- Affichage des titres des colonnes des propri�t�s baties -->
+                                 <fo:table-row>
+                                    <fo:table-cell border="0.5pt solid black">
+                                      <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">AN</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">SECTION</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">N�PLAN</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">CP</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">N� Voirie</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">ADRESSE</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black" border-left="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">CODE RIVOLI</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">BAT</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">ENT</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">NIV</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">N�PORTE</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">N�INVAR</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">S TAR</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">M EVAL</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">AF</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">NAT LOC</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">CAT</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">REVENU CADASTRAL</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">COLL</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">NAT EXO</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">AN RET</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">AN DEB</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">FRACTION RC EXO</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">% EXO</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">TX OM</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">COEF</fo:block>
+                                    </fo:table-cell>
+                                 </fo:table-row>
+                              </fo:table-header>
+
+                              <fo:table-footer>
+                                 <fo:table-row>
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+                                 </fo:table-row>
+                              </fo:table-footer>
+
+<!-- Affichage des donn�es des propri�t�s baties -->
+                              <fo:table-body>
+                                 <fo:table-row>
+                                    <fo:table-cell>
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+                                 </fo:table-row>
+
+                                 <xsl:for-each select="Mj/Mj_Compte_Communal/Mj_Bati | Mj/Mj_Compte_Communal_Parcelle/Mj_Bati">
+								 <xsl:sort select="@section" />
+									<xsl:sort select="@num_plan" data-type="number"/>
+                                    <fo:table-row>
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@date" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell padding-right="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="right" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@section" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@num_plan" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@cp" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@voirie" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell padding-left="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@adresse" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-left="hidden" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@code_rivoli" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@bat" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@ent" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@niv" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@num_de_porte" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell padding-left="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@num_invar" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+<!--Affichage du PEV lorsqu'il n'y en a qu'un (m�me ligne) -->
+                                       <xsl:if test="count(Mj_Pev) = 1">
+                                          <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="@s_tar" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="@m_eva" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="@af" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="@nat_loc" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="@cat" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell padding-right="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="right" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="@revenu_cadastral" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="Mj_Pev/Mj_Exone_Pev/@coll" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell padding-right="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="Mj_Pev/@nat_exo" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="Mj_Pev/Mj_Exone_Pev/@an_ret" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="right" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="Mj_Pev/Mj_Exone_Pev/@fraction_rc_exo" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="Mj_Pev/Mj_Exone_Pev/@pourc_exo" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="@tx_om" />
+                                             </fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             </fo:block>
+                                          </fo:table-cell>
+                                       </xsl:if>
+
+<!--Affichage du premier PEV lorsqu'il y en a plusieurs (m�me ligne) -->
+                                       <xsl:if test="count(Mj_Pev) &gt; 1">
+                                          <xsl:for-each select="Mj_Pev">
+                                             <xsl:if test="position()=1">
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                      <xsl:value-of select="@s_tar" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                      <xsl:value-of select="../@m_eva" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                      <xsl:value-of select="@af" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                      <xsl:value-of select="../@nat_loc" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                      <xsl:value-of select="@cat" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell padding-right="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="right" vertical-align="middle" line-height="0.5cm">
+                                                      <xsl:value-of select="@revenu_cadastral" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                      <xsl:value-of select="@nat_exo" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+                                             </xsl:if>
+                                          </xsl:for-each>
+                                       </xsl:if>
+                                    </fo:table-row>
+
+<!--Affichage des PEV suivants (lignes suivantes) -->
+                                    <xsl:if test="count(Mj_Pev) &gt; 1">
+                                       <xsl:for-each select="Mj_Pev">
+                                          <xsl:if test="position()&gt;1">
+                                             <fo:table-row>
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                      <xsl:value-of select="@s_tar" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                      <xsl:value-of select="../@m_eva" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                      <xsl:value-of select="@af" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                      <xsl:value-of select="../@nat_loc" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                      <xsl:value-of select="@cat" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell padding-right="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="right" vertical-align="middle" line-height="0.25cm">
+                                                      <xsl:value-of select="@revenu_cadastral" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                      <xsl:value-of select="@nat_exo" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+                                             </fo:table-row>
+
+                                             <fo:table-row>
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell padding-right="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="right" vertical-align="middle" line-height="0.25cm">
+                                                      <xsl:value-of select="../@revenu_cadastral" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                      <xsl:value-of select="../@tx_om" />
+                                                   </fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                   </fo:block>
+                                                </fo:table-cell>
+                                             </fo:table-row>
+                                          </xsl:if>
+                                       </xsl:for-each>
+                                    </xsl:if>
+
+<!--Affichage des Lot_Local s'il y en a -->
+                                    <xsl:if test="count(Mj_Lot_Local) &gt; 0">
+                                       <xsl:for-each select="Mj_Lot_Local">
+                                          <fo:table-row>
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell padding-left="0.4cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block vertical-align="middle" line-height="0.25cm">
+                                                   <xsl:value-of select="@lot" />
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell padding-right="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="right" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+                                          </fo:table-row>
+                                       </xsl:for-each>
+                                    </xsl:if>
+                                 </xsl:for-each>
+                              </fo:table-body>
+                           </fo:table>
+                        </fo:table-cell>
+                     </fo:table-row>
+
+<!-- Affichage du pied du tableau des proprietes baties -->
+                     <fo:table-row>
+                        <fo:table-cell>
+                           <fo:block keep-together="always" keep-with-previous="always">
+                              <fo:table table-layout="fixed" border-collapse="collapse" width="28.7cm" border-color="black" border-right="0.5pt" border-left="0.5pt" border-top="0pt" border-bottom="0.5pt" border-style="solid" font-size="6pt" padding-top="0.2cm" padding-bottom="0.1cm">
+                                 <fo:table-column column-width="1.8cm" />
+
+                                 <fo:table-column column-width="2cm" />
+
+                                 <fo:table-column column-width="2.5cm" />
+
+                                 <fo:table-column column-width="1.5cm" />
+
+                                 <fo:table-column column-width="2cm" />
+
+                                 <fo:table-column column-width="2.5cm" />
+
+                                 <fo:table-column column-width="1.5cm" />
+
+                                 <fo:table-column column-width="2cm" />
+
+                                 <fo:table-column column-width="2.5cm" />
+
+                                 <fo:table-column column-width="1.5cm" />
+
+                                 <fo:table-column column-width="2cm" />
+
+                                 <fo:table-column column-width="6.9cm" />
+
+                                 <fo:table-body>
+                                    <xsl:for-each select="Mj/Mj_Compte_Communal | Mj/Mj_Compte_Communal_Parcelle">
+                                       <fo:table-row>
+										  <fo:table-cell number-columns-spanned="4">
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">R EXO</fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">
+                                             <xsl:value-of select="@exo_com_bati" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+
+										  <fo:table-cell number-columns-spanned="2">
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">R EXO</fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">
+                                             <xsl:value-of select="@exo_dep_bati" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+
+										  <fo:table-cell number-columns-spanned="2">
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">R EXO</fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">
+                                             <xsl:value-of select="@exo_reg_bati" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+                                       </fo:table-row>
+
+                                       <fo:table-row>
+                                          <fo:table-cell>
+                                             <fo:block text-align="left" line-height="0.60cm" vertical-align="middle">REV IMPOSABLE</fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.60cm" vertical-align="middle">
+                                             <xsl:value-of select="@rev_impo_bati" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.60cm" vertical-align="middle">COM</fo:block>
+                                          </fo:table-cell>
+
+										  <fo:table-cell number-columns-spanned="3">
+                                             <fo:block text-align="right" line-height="0.60cm" vertical-align="middle">DEP</fo:block>
+                                          </fo:table-cell>
+
+										  <fo:table-cell number-columns-spanned="3">
+                                             <fo:block text-align="right" line-height="0.60cm" vertical-align="middle">R</fo:block>
+                                          </fo:table-cell>
+                                       </fo:table-row>
+
+                                       <fo:table-row>
+										  <fo:table-cell number-columns-spanned="4">
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">R IMP</fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">
+                                             <xsl:value-of select="@rev_impo_com_bati" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+
+										  <fo:table-cell number-columns-spanned="2">
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">R IMP</fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">
+                                             <xsl:value-of select="@rev_impo_dep_bati" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+
+										  <fo:table-cell number-columns-spanned="2">
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">R IMP</fo:block>
+                                          </fo:table-cell>
+
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">
+                                             <xsl:value-of select="@rev_impo_reg_bati" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+                                       </fo:table-row>
+                                    </xsl:for-each>
+                                 </fo:table-body>
+                              </fo:table>
+                           </fo:block>
+                        </fo:table-cell>
+                     </fo:table-row>
+
+<!-- Affichage des proprietes non baties -->
+                     <fo:table-row>
+                        <fo:table-cell>
+                           <fo:table table-layout="fixed" width="100%" border-collapse="collapse" font-size="7pt">
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="1.5cm" />
+
+                              <fo:table-column column-width="1.2cm" />
+
+                              <fo:table-column column-width="1.2cm" />
+
+                              <fo:table-column column-width="5.8cm" />
+
+                              <fo:table-column column-width="0.9cm" />
+
+                              <fo:table-column column-width="1.4cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="0.9cm" />
+
+                              <fo:table-column column-width="1.1cm" />
+
+                              <fo:table-column column-width="1cm" />
+
+                              <fo:table-column column-width="0.9cm" />
+
+                              <fo:table-column column-width="0.7cm" />
+
+                              <fo:table-column column-width="0.7cm" />
+
+                              <fo:table-column column-width="0.7cm" />
+
+                              <fo:table-column column-width="2cm" />
+
+                              <fo:table-column column-width="0.9cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="1.5cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+                              <fo:table-column column-width="0.6cm" />
+
+<!-- Affichage de l'en-t�te des proprietes non baties -->
+                              <fo:table-header>
+                                 <fo:table-row>
+                                    <fo:table-cell number-columns-spanned="23" padding-top="1cm" padding-bottom="0.1cm">
+                                       <fo:block text-align="center" font-size="8pt" line-height="0.5cm" vertical-align="middle">PROPRIETES NON BATIES</fo:block>
+                                    </fo:table-cell>
+                                 </fo:table-row>
+
+                                 <fo:table-row>
+                                    <fo:table-cell number-columns-spanned="6" border="0.5pt solid black">
+                                       <fo:block text-align="center" font-size="8pt" line-height="0.5cm" vertical-align="middle">DESIGNATION DES PROPRIETES</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell number-columns-spanned="17" border="0.5pt solid black" border-left="hidden">
+                                       <fo:block text-align="center" font-size="8pt" line-height="0.5cm" vertical-align="middle">EVALUATION</fo:block>
+                                    </fo:table-cell>
+                                 </fo:table-row>
+
+<!-- Affichage des titres des colonnes des proprietes non baties -->
+                                 <fo:table-row>
+                                    <fo:table-cell border="0.5pt solid black">
+                                      <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">AN</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">SECTION</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">N�PLAN</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">N� Voirie</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">ADRESSE</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black" border-left="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">CODE RIVOLI</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">N�PARC PRIM</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black" border-left="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">FP DP</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black" border-left="hidden">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">S TAR</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">SUF</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">GR/SS GR</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">CLASSE</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">NAT CULT</fo:block>
+                                    </fo:table-cell>
+
+<!-- Creation d'une table pour afficher le titre de colonne (CONTENANCE HA A CA) -->
+                                    <fo:table-cell number-columns-spanned="3" border="0.5pt solid black">
+                                       <fo:table table-layout="fixed" border-collapse="collapse" font-size="6pt" width="100%">
+                                          <fo:table-body>
+                                             <fo:table-row>
+                                                <fo:table-cell number-columns-spanned="3" padding-top="0.05cm">
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">CONTENANCE</fo:block>
+                                                </fo:table-cell>
+                                             </fo:table-row>
+
+                                             <fo:table-row>
+                                                <fo:table-cell>
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">HA</fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell>
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">A</fo:block>
+                                                </fo:table-cell>
+
+                                                <fo:table-cell>
+                                                   <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">CA</fo:block>
+                                                </fo:table-cell>
+                                             </fo:table-row>
+                                          </fo:table-body>
+                                       </fo:table>
+                                    </fo:table-cell>
+
+<!-- Suite de l'affichage des titres des colonnes des proprietes non baties -->
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">REVENU CADASTRAL</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">COLL</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">NAT EXO</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">AN RET</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">FRACTION RC EXO</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">% EXO</fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">POS</fo:block>
+                                    </fo:table-cell>
+                                 </fo:table-row>
+                              </fo:table-header>
+
+                              <fo:table-footer>
+                                 <fo:table-row>
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block>
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell number-columns-spanned="3" border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.25cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+
+                                    <fo:table-cell border="0.5pt solid black">
+                                       <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                       </fo:block>
+                                    </fo:table-cell>
+                                 </fo:table-row>
+                              </fo:table-footer>
+
+<!-- Affichage des donnees des proprietes non baties -->
+							<fo:table-body>
+								<fo:table-row>
+									<fo:table-cell>
+										<fo:block></fo:block>
+									</fo:table-cell>
+								</fo:table-row>
+
+								<xsl:for-each select="Mj/Mj_Compte_Communal/Mj_Parcelle | Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle">
+									<xsl:sort select="@section" />
+									<xsl:sort select="@num_plan" data-type="number"/>
+									<fo:table-row>
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@date" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell padding-right="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="right" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@section" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@num_plan" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@num_voirie" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell padding-left="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@adresse" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell padding-left="0.1cm" border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@code_rivoli" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@num_parc_prim" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@fp_dp" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@s_tar" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@suf" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@grss_gr" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@clas" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@nat_cult" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@ha" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@a" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="@ca" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+<!-- Affichage de la colonne revenu cadastral lorsqu'il a une seule suf -->
+                                       <xsl:if test="count(Mj_Suf)=1">
+                                          <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                <xsl:value-of select="@revenu_cadastral" />
+                                             </fo:block>
+                                          </fo:table-cell>
+                                       </xsl:if>
+
+<!-- Affichage de la colonne revenu cadastral lorsqu'il a plusieurs sufs -->
+                                       <xsl:if test="count(Mj_Suf) &gt; 1">
+                                          <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                             <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             </fo:block>
+                                          </fo:table-cell>
+                                       </xsl:if>
+
+<!-- Suite de l'affichage des donnees des proprietes non baties -->
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                             <xsl:value-of select="Mj_Suf/@nat_exo" />
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                          </fo:block>
+                                       </fo:table-cell>
+
+                                       <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                          <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                          </fo:block>
+                                       </fo:table-cell>
+                                    </fo:table-row>
+
+<!-- Affichage des Suf lorsqu'il y en a plusieurs -->
+                                    <xsl:if test="count(Mj_Suf) &gt; 1">
+                                       <xsl:for-each select="Mj_Suf">
+                                          <fo:table-row>
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                   <xsl:value-of select="@s_tar" />
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                   <xsl:value-of select="@suf" />
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                   <xsl:value-of select="@grss_gr" />
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                   <xsl:value-of select="@clas" />
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                   <xsl:value-of select="@nat_cult" />
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                   <xsl:value-of select="@ha" />
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                   <xsl:value-of select="@a" />
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden" border-left="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                   <xsl:value-of select="@ca" />
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                   <xsl:value-of select="@revenu_cadastral" />
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                   <xsl:value-of select="@nat_exo" />
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+
+                                             <fo:table-cell border="0.5pt solid black" border-bottom="hidden" border-top="hidden">
+                                                <fo:block text-align="center" vertical-align="middle" line-height="0.5cm">
+                                                </fo:block>
+                                             </fo:table-cell>
+                                          </fo:table-row>
+                                       </xsl:for-each>
+									</xsl:if>
+								</xsl:for-each>
+                              </fo:table-body>
+                           </fo:table>
+                        </fo:table-cell>
+                     </fo:table-row>
+
+<!-- Affichage du pied du tableau des proprietes non baties -->
+                     <fo:table-row>
+                        <fo:table-cell>
+                           <fo:block keep-together="always" keep-with-previous="always">
+                              <fo:table width="26.6cm" table-layout="fixed" border-color="black" border-right="0.5pt" border-left="0.5pt" border-top="0pt" border-bottom="0.5pt" border-style="solid" border-collapse="collapse" font-size="6pt" padding-top="0.2cm" padding-bottom="0.1cm">
+                                 <fo:table-column column-width="1cm" />
+                                 <fo:table-column column-width="1cm" />
+                                 <fo:table-column column-width="1cm" />
+                                 <fo:table-column column-width="1cm" />
+                                 <fo:table-column column-width="1.8cm" />
+                                 <fo:table-column column-width="2cm" />
+                                 <fo:table-column column-width="2cm" />
+                                 <fo:table-column column-width="1.5cm" />
+                                 <fo:table-column column-width="2cm" />
+                                 <fo:table-column column-width="2cm" />
+                                 <fo:table-column column-width="1.5cm" />
+                                 <fo:table-column column-width="2cm" />
+                                 <fo:table-column column-width="2cm" />
+                                 <fo:table-column column-width="1.5cm" />
+                                 <fo:table-column column-width="2cm" />
+                                 <fo:table-column column-width="2.3cm" />
+                                 <fo:table-body>
+                                    <xsl:for-each select="Mj/Mj_Compte_Communal | Mj/Mj_Compte_Communal_Parcelle">
+                                       <fo:table-row>
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle"></fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="center" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">HA</fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="center" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">A</fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="center" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">CA</fo:block>
+                                          </fo:table-cell>
+										  <fo:table-cell number-columns-spanned="4">
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">R EXO</fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">
+                                             <xsl:value-of select="@exo_com_par" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+										  <fo:table-cell number-columns-spanned="2">
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">R EXO</fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">
+                                             <xsl:value-of select="@exo_dep_par" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+										  <fo:table-cell number-columns-spanned="2">
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">R EXO</fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" margin-top="0.20cm" vertical-align="middle">
+                                             <xsl:value-of select="@exo_reg_par" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+                                       </fo:table-row>
+                                       <fo:table-row>
+                                          <fo:table-cell>
+                                             <fo:block text-align="left" line-height="0.60cm" vertical-align="middle">CONT</fo:block>
+                                          </fo:table-cell>
+										  <fo:table-cell number-columns-spanned="4">
+                                             <fo:block text-align="right" line-height="0.60cm" vertical-align="middle">REV IMPOSABLE</fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.60cm" vertical-align="middle">
+                                             <xsl:value-of select="@rev_impo_par" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.60cm" vertical-align="middle">COM</fo:block>
+                                          </fo:table-cell>
+										  <fo:table-cell number-columns-spanned="3">
+                                             <fo:block text-align="right" line-height="0.60cm" vertical-align="middle">DEP</fo:block>
+                                          </fo:table-cell>
+										  <fo:table-cell number-columns-spanned="3">
+                                             <fo:block text-align="right" line-height="0.60cm" vertical-align="middle">R</fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell number-columns-spanned="3" padding-right="0.8cm">
+                                             <fo:block text-align="right" line-height="0.60cm" vertical-align="middle">MAJ POS</fo:block>
+                                          </fo:table-cell>
+                                       </fo:table-row>
+                                       <fo:table-row>
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle">
+                                             </fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="center" line-height="0.20cm" vertical-align="middle">
+                                                <xsl:value-of select="@ha" />
+                                             </fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="center" line-height="0.20cm" vertical-align="middle">
+                                                <xsl:value-of select="@a" />
+                                             </fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="center" line-height="0.20cm" vertical-align="middle">
+                                                <xsl:value-of select="@ca" />
+                                             </fo:block>
+                                          </fo:table-cell>
+										  <fo:table-cell number-columns-spanned="4">
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle">R IMP</fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle">
+                                             <xsl:value-of select="@rev_impo_com_par" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+										  <fo:table-cell number-columns-spanned="2">
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle">R IMP</fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle">
+                                             <xsl:value-of select="@rev_impo_dep_par" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+										  <fo:table-cell number-columns-spanned="2">
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle">R IMP</fo:block>
+                                          </fo:table-cell>
+                                          <fo:table-cell>
+                                             <fo:block text-align="right" line-height="0.20cm" vertical-align="middle">
+                                             <xsl:value-of select="@rev_impo_reg_par" />
+
+                                             EUR</fo:block>
+                                          </fo:table-cell>
+                                       </fo:table-row>
+                                    </xsl:for-each>
+                                 </fo:table-body>
+
+<!-- Fin de la table du pied du tableau des propi�t�s non baties -->
+                              </fo:table>
+                           </fo:block>
+                        </fo:table-cell>
+                     </fo:table-row>
+
+<!-- Fin du corps du tableau global -->
+                  </fo:table-body>
+
+<!-- Fin du tableau global -->
+               </fo:table>
+
+               <fo:block id="theEnd" />
+            </fo:flow>
+         </fo:page-sequence>
+      </fo:root>
+   </xsl:template>
+</xsl:stylesheet>
+
diff --git a/src/module_cadastreV2/web_service/class/majic_libV2/xsl/RP.xslt b/src/module_cadastreV2/web_service/class/majic_libV2/xsl/RP.xslt
new file mode 100755
index 0000000000000000000000000000000000000000..0dae5920b7c5ea243e24c24766bed273d10c901b
--- /dev/null
+++ b/src/module_cadastreV2/web_service/class/majic_libV2/xsl/RP.xslt
@@ -0,0 +1,3036 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE xsl:stylesheet [
+  <!ENTITY nbsp "&#160;">
+]>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  <xsl:output method="html" encoding="utf-8" doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
+  <xsl:template match="/">
+    <xsl:param name="poste"/>
+    <xsl:param name="type"/>
+
+    <html xmlns="http://www.w3.org/1999/xhtml"
+      lang="fr"
+      >
+      <body>
+        <table  table-layout="fixed" width="100%" CELLSPACING="0" CELLPADDING="0">
+          
+          <!-- Début de l'en-tête qui se retrouvera sur chaque page du RP -->
+          
+          <thead>
+            <tr> 
+              <td width="100%">
+                
+                <table style="text-align: center; font-size: 10pt;line-height: 0.8cm;" width="100%" CELLSPACING="0" CELLPADDING="1" >
+                  <tbody>
+                    <xsl:for-each select="Mj/Mj_Compte_Communal | Mj/Mj_Compte_Communal_Parcelle">
+                      <tr>
+                        <td  style="border-width: 0.5pt; border-style: solid; border-color: black; border-right: hidden;" width="4.14%">
+                          <div style="vertical-align: middle; line-height: 0.3cm; text-align: center;">ANNEE DE MAJ</div>
+                        </td>
+                        <td style="border-width: 0.5pt; border-style: solid; border-color: black; border-right: hidden;" width="2.07%">
+                          <div style="vertical-align: middle; line-height: 0.6cm; text-align: center;">
+                            <xsl:value-of select="@annee_de_maj"/>
+                          </div>
+                        </td>
+                        <td style="border-width: 0.5pt; border-style: solid; border-color: black; border-right: hidden;" width="2.07%">
+                          <div style="vertical-align: middle; line-height: 0.3cm; text-align: center;">DEP DIR</div>
+                        </td>                       
+                        <td style="border-width: 0.5pt; border-style: solid; border-color: black; border-right: hidden;" width="3.11%">
+                          <div style="vertical-align: middle; line-height: 0.6cm; text-align: center;">
+                            <xsl:value-of select="@dep_dir"/>
+                          </div>
+                        </td>                        
+                        <td style="border-width: 0.5pt; border-style: solid; border-color: black; border-right: hidden;" whidth="3.11%">
+                          <div style="vertical-align: middle; line-height: 0.6cm; text-align: center;">COM</div>
+                        </td>
+                        <td style="border-width: 0.5pt; border-style: solid; border-color: black;" whidth="22.08%">
+                          <div style="vertical-align: middle; line-height: 0.6cm; text-align: center;">
+                            <xsl:value-of select="@com"/>
+                          </div>
+                        </td>
+                        <td whidth="53.13%">
+                          <div style="font-style: italic; font-size: 16pt; vertical-align: middle; line-height: 0.5cm; text-align: center;">
+                            RELEVE DE PROPRIETE
+                          </div>
+                        </td>                        
+                        <td style="border-width: 0.5pt; border-style: solid; border-color: black; border-right: hidden;" whidth="6.21%">
+                          <div style="vertical-align: middle; line-height: 0.3cm; text-align: center;">NUMERO COMMUNAL</div>
+                        </td>                      
+                        <td style="border-width: 0.5pt; border-style: solid; border-color: black;" whidth="3.11%">
+                          <div style="vertical-align: middle; line-height: 0.6cm; text-align: center;">
+                            <xsl:value-of select="substring(@numero_communal,6)"/>
+                          </div>
+                        </td>
+                      </tr>
+                    </xsl:for-each>
+                  </tbody>
+                </table>
+              </td>
+            </tr>
+            <!-- Affichage de la ligne titre "PROPRIETAIRE" -->
+            <tr>             
+              <td width="100%"> 
+                <table style="text-align: center;" width="100%">
+                  <tbody> 
+                    <tr>
+                      <td padding-top="0.5cm" padding-bottom="0.1cm">
+                        <div style="font-size: 10pt; text-align: center;">PROPRIETAIRE</div>
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </td>
+            </tr>
+            <!-- Affichage du tableau proprietaire -->
+            
+            <tr>
+              
+              <td>
+                
+                <table style="text-align: left; table-layout: fixed; border-color: black; border: 0.5pt; border-style: solid; border-collapse: collapse; font-size: 10pt; padding-top: 0.2cm; padding-bottom: 0.1cm;" width="100%" >                 
+                  
+                  
+                  <tbody>
+                    
+                    <xsl:for-each select="Mj/Mj_Compte_Communal/Mj_Proprietaire | Mj/Mj_Compte_Communal_Parcelle/Mj_Proprietaire">
+                      
+                      <tr>
+                        <xsl:if test="$type='complet'">
+                          <td width="75%" style="padding-left: 0.3cm;">
+                            <div>
+                              <xsl:value-of select="@l_ccodro"/>&nbsp;<xsl:value-of select="@l_ccodem"/>&nbsp;<xsl:value-of select="@dnuper"/>&nbsp;<xsl:value-of select="@proprietaire_nom"/>
+                            </div>
+                          </td>
+
+                          <td width="25%" style="padding-left: 0.3cm;">
+                            <div>
+                              <xsl:value-of select="@jdatnss"/>
+                            </div>
+                          </td>
+                        </xsl:if>
+                        <xsl:if test="not($type='complet')">
+                          <td width="100%" style="padding-left: 0.3cm;">
+                            <div>
+                              <xsl:value-of select="@l_ccodro"/>&nbsp;<xsl:value-of select="@l_ccodem"/>&nbsp;<xsl:value-of select="@dnuper"/>&nbsp;<xsl:value-of select="@proprietaire_nom_tiers"/>
+                            </div>
+                          </td>
+                        </xsl:if>
+                      </tr>
+                      
+                      <tr>
+                        <td style="padding-left: 0.3cm;">
+                          <div>
+                            <xsl:value-of select="@proprietaire_adresse"/>
+                          </div>
+                        </td>
+                        <xsl:if test="$type='complet'">
+                          <td>
+                            <div>
+                              <xsl:value-of select="@dldnss"/>
+                            </div>
+                          </td>
+                        </xsl:if>
+                      </tr>
+                    </xsl:for-each>
+                  </tbody>
+                </table>
+              </td>
+            </tr>
+          </thead>
+          <!-- Fin de l'en-tête -->
+          <!-- Début du corps du tableau global -->
+          
+          <tbody>
+            <!-- Affichage des poprietes baties -->
+            
+            <tr>
+
+              <td width="100%">
+                
+                <table width="100%" style="text-align: center; font-size: 10pt;" CELLSPACING="0" CELLPADDING="0"  >
+                  
+                  <!-- Affichage de l'en-tête des propriétés baties -->
+                  
+                  <thead width="100%">
+                    
+                    <tr >
+                      <xsl:if test="$type='complet'">
+                        <td style="text-align: center; border-color: black; border-style: solid; border-left: hidden; border-right: hidden; border-top: hidden; border-bottom: hidden; border-width: 0.5pt; padding-top: 1cm; padding-bottom: 0.1cm;" valign="top" colspan="26" >
+                          <div style ="text-align: center; font-size: 8pt; line-height: 0.5cm; vertical-align: middle;" >PROPRIETES BATIES</div>
+                        </td>
+                      </xsl:if>
+                      <xsl:if test="not($type='complet')">
+                        <td style="text-align: center; border-color: black; border-style: solid; border-left: hidden; border-right: hidden; border-top: hidden; border-bottom: hidden; border-width: 0.5pt; padding-top: 1cm; padding-bottom: 0.1cm;" valign="top" colspan="20" >
+                          <div style ="text-align: center; font-size: 8pt; line-height: 0.5cm; vertical-align: middle;" >PROPRIETES BATIES</div>
+                        </td>
+                      </xsl:if>
+                    </tr>
+                    
+                    <tr>
+                      
+                      <td style="border-color: black; border-style: solid; border-right: hidden; border-bottom: hidden; border-width: 0.5pt;" valign="top" colspan="7">
+                        <div style ="text-align: center; font-size: 8pt; line-height: 0.5cm; vertical-align: middle;" >DESIGNATION DES PROPRIETES</div>
+                      </td>
+                      
+                      <td style="border-color: black; border-style: solid; border-left: hidden; border-bottom: hidden; border-right: hidden; border-width: 0.5pt;" valign="top" colspan="5">
+                        <div style ="text-align: center; font-size: 8pt; line-height: 0.5cm; vertical-align: middle;" >IDENTIFICATION DU LOCAL</div>
+                      </td>
+                      <xsl:if test="$type='complet'">
+                        <td style="border-color: black; border-style: solid; border-left: hidden; border-bottom: hidden; border-width: 0.5pt;" valign="top" colspan="14">
+                          <div style ="text-align: center; font-size: 8pt; line-height: 0.5cm; vertical-align: middle;" >EVALUATION DU LOCAL</div>
+                        </td>
+                      </xsl:if>
+                      <xsl:if test="not($type='complet')">
+                        <td style="border-color: black; border-style: solid; border-left: hidden; border-bottom: hidden; border-width: 0.5pt;" valign="top" colspan="8">
+                          <div style ="text-align: center; font-size: 8pt; line-height: 0.5cm; vertical-align: middle;" >EVALUATION DU LOCAL</div>
+                        </td>
+                      </xsl:if>
+                    </tr>
+                    
+                    <!-- Affichage des titres des colonnes des propriétés baties -->
+                    
+                    <tr>
+
+                      <td width="2.07%" style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden;" valign="top">
+                        <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">AN</div>
+                      </td>
+                      
+                      <td width="4.14%" style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden;" valign="top">
+                        <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">SECTION</div>
+                      </td>
+
+                      <td width="3.45%" style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden;" valign="top">
+                        <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">N°PLAN</div>
+                      </td>
+
+                      <td width="1.38%" style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden;" valign="top">
+                        <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">CP</div>
+                      </td>
+
+                      <td width="4.14%" style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden;" valign="top">
+                        <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">N° Voirie</div>
+                      </td>
+
+                      <xsl:if test="$type='complet'">
+                        <td width="22.08%" style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden;" valign="top">
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">ADRESSE</div>
+                        </td>
+                      </xsl:if>
+                      <xsl:if test="not($type='complet')">
+                        <td width="38.99%" style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden;" valign="top">
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">ADRESSE</div>
+                        </td>
+                      </xsl:if>
+
+                      <td width="3.11%" style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-left: hidden;" valign="top">
+                        <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">CODE RIVOLI</div>
+                      </td>
+
+                      <td width="2.07%" style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden;" valign="top">
+                        <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">BAT</div>
+                      </td>
+
+                      <td width="2.07%" style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden;" valign="top">
+                        <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">ENT</div>
+                      </td>
+
+                      <td width="2.07%" style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden;" valign="top">
+                        <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">NIV</div>
+                      </td>
+
+                      <td width="4.14%" style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden;" valign="top">
+                        <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">N°PORTE</div>
+                      </td>
+
+                      <td width="6.21%" style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden;" valign="top">
+                        <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">N°INVAR</div>
+                      </td>
+
+                      <td width="2.42%" style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden;" valign="top">
+                        <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">S TAR</div>
+                      </td>
+
+                      <td width="2.42%" style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden;" valign="top">
+                        <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">M EVAL</div>
+                      </td>
+
+                      <td width="1.38%" style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden;" valign="top">
+                        <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">AF</div>
+                      </td>
+
+                      <td width="4.14%" style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden;" valign="top">
+                        <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">NAT LOC</div>
+                      </td>
+
+                      <td width="2.07%" style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden;" valign="top">
+                        <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">CAT</div>
+                      </td>
+
+                      <td width="8.28%" style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden;" valign="top">
+                        <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">REVENU CADASTRAL</div>
+                      </td>
+
+                      <xsl:if test="$type='complet'">
+                        <td width="2.42%" style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden;" valign="top">
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">COLL</div>
+                        </td>
+
+                        <td width="2.07%" style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden;" valign="top">
+                          <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">NAT EXO</div>
+                        </td>
+
+                        <td width="2.07%" style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden;" valign="top">
+                          <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">AN RET</div>
+                        </td>
+
+                        <td width="2.07%" style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden;" valign="top">
+                          <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">AN DEB</div>
+                        </td>
+
+                        <td width="6.21%" style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden;" valign="top">
+                          <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">FRACTION RC EXO</div>
+                        </td>
+
+                        <td width="2.07%" style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden;" valign="top">
+                          <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">% EXO</div>
+                        </td>
+                      </xsl:if>
+
+                      <td width="2.07%" style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden;" valign="top">
+                        <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">TX OM</div>
+                      </td>
+
+                      <td width="2.42%" style="border-style: solid; border-width: 0.5pt; border-color: black;" valign="top">
+                        <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">COEF</div>
+                      </td>
+                    </tr>
+                  </thead>
+                  
+                  <tfoot>
+                    
+                    <tr>
+
+                      <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-left: hidden;" valign="top">
+                        <div>
+                        </div>
+                      </td>
+                      
+                      <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-left: hidden;" valign="top">
+                        <div>
+                        </div>
+                      </td>
+                      
+                      <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-left: hidden;" valign="top">
+                        <div>
+                        </div>
+                      </td>
+                      
+                      <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-left: hidden;" valign="top">
+                        <div>
+                        </div>
+                      </td>
+                      
+                      <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-left: hidden;" valign="top">
+                        <div>
+                        </div>
+                      </td>
+                      
+                      <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-left: hidden;" valign="top">
+                        <div>
+                        </div>
+                      </td>
+                      
+                      <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-left: hidden;" valign="top">
+                        <div>
+                        </div>
+                      </td>
+                      
+                      <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-left: hidden;" valign="top">
+                        <div>
+                        </div>
+                      </td>
+                      
+                      <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-left: hidden;" valign="top">
+                        <div>
+                        </div>
+                      </td>
+                      
+                      <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-left: hidden;" valign="top">
+                        <div>
+                        </div>
+                      </td>
+                      
+                      <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-left: hidden;" valign="top">
+                        <div>
+                        </div>
+                      </td>
+                      
+                      <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-left: hidden;" valign="top">
+                        <div>
+                        </div>
+                      </td>
+                      
+                      <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-left: hidden;" valign="top">
+                        <div>
+                        </div>
+                      </td>
+                      
+                      <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-left: hidden;" valign="top">
+                        <div>
+                        </div>
+                      </td>
+                      
+                      <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-left: hidden;" valign="top">
+                        <div>
+                        </div>
+                      </td>
+                      
+                      <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-left: hidden;" valign="top">
+                        <div>
+                        </div>
+                      </td>
+                      
+                      <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-left: hidden;" valign="top">
+                        <div>
+                        </div>
+                      </td>
+                      
+                      <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-left: hidden;" valign="top">
+                        <div>
+                        </div>
+                      </td>
+
+                      <xsl:if test="$type='complet'">
+                        <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-left: hidden;" valign="top">
+                          <div>
+                          </div>
+                        </td>
+
+                        <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-left: hidden;" valign="top">
+                          <div>
+                          </div>
+                        </td>
+
+                        <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-left: hidden;" valign="top">
+                          <div>
+                          </div>
+                        </td>
+
+                        <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-left: hidden;" valign="top">
+                          <div>
+                          </div>
+                        </td>
+
+                        <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-left: hidden;" valign="top">
+                          <div>
+                          </div>
+                        </td>
+
+                        <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-left: hidden;" valign="top">
+                          <div>
+                          </div>
+                        </td>
+                      </xsl:if>
+                        
+                      <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-left: hidden;" valign="top">
+                        <div>
+                        </div>
+                      </td>
+                      
+                      <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-left: hidden;" valign="top">
+                        <div>
+                        </div>
+                      </td>
+                    </tr>
+                  </tfoot>
+                  <!-- Affichage des données des propriétés baties -->
+                  
+                  <tbody>
+                    
+                    <tr>
+                      
+                      <td>
+                        <div>
+                        </div>
+                      </td>
+                    </tr>
+                    
+                    <xsl:for-each select="Mj/Mj_Compte_Communal/Mj_Bati | Mj/Mj_Compte_Communal_Parcelle/Mj_Bati">
+						 <xsl:sort select="substring(@num_invar,1,3)" />
+
+                      <xsl:sort select="@section" />
+						<xsl:sort select="@num_plan" data-type="number"/>
+                      <tr>
+                        
+                        <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                          
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                            <xsl:value-of select="@date"/>
+                          </div>
+                        </td>
+                        
+                        <td style="padding-right: 0.1cm;border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                          
+                          <div text-align="right" vertical-align="middle" line-height="0.5cm">
+                            <xsl:value-of select="@section"/>
+                          </div>
+                        </td>
+                        
+                        <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                          
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                            <xsl:value-of select="@num_plan"/>
+                          </div>
+                        </td>
+                        
+                        <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                          
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                            <xsl:value-of select="@cp"/>
+                          </div>
+                        </td>
+                        
+                        <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                          
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                            <xsl:value-of select="@voirie"/>
+                          </div>
+                        </td>
+                        
+                        <td style="padding-left: 0.1cm; border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                          
+                          <div vertical-align="middle" line-height="0.5cm">
+                            <xsl:value-of select="@adresse"/>
+                          </div>
+                        </td>
+                        
+                        <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden; border-left: hidden;" valign="top">
+                          
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                            <xsl:value-of select="@code_rivoli"/>
+                          </div>
+                        </td>
+                        
+                        <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                          
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                            <xsl:value-of select="@bat"/>
+                          </div>
+                        </td>
+                        
+                        <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden; border-left: hidden;">
+                          
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                            <xsl:value-of select="@ent"/>
+                          </div>
+                        </td>
+                        
+                        <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden; border-left: hidden;">
+                          
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                            <xsl:value-of select="@niv"/>
+                          </div>
+                        </td>
+                        
+                        <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden; border-left: hidden;">
+                          
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                            <xsl:value-of select="@num_de_porte"/>
+                          </div>
+                        </td>
+                        
+                        <td style="padding-left: 0.1cm; border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;">
+                          
+                          <div vertical-align="middle" line-height="0.5cm">
+                            <xsl:value-of select="@num_invar"/>
+                          </div>
+                        </td>
+                        
+                        <!-- Affichage du PEV lorsqu'il n'y en a qu'un (même ligne) -->
+                        
+                        <xsl:if test="count(Mj_Pev) = 1">
+                          
+                          <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                            
+                            <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                              <xsl:value-of select="@s_tar"/>
+                            </div>
+                          </td>
+                          
+                          <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                            
+                            <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                              <xsl:value-of select="@m_eva"/>
+                            </div>
+                          </td>
+                          
+                          <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                            
+                            <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                              <xsl:value-of select="@af"/>
+                            </div>
+                          </td>
+                          
+                          <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                            
+                            <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                              <xsl:value-of select="@nat_loc"/>
+                            </div>
+                          </td>
+                          
+                          <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                            
+                            <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                              <xsl:value-of select="@cat"/>
+                            </div>
+                          </td>
+                          
+                          <td style="padding-right: 0.1cm; border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                            
+                            <div text-align="right" vertical-align="middle" line-height="0.5cm">
+                              <xsl:value-of select="@revenu_cadastral"/>
+                            </div>
+                          </td>
+
+                          <xsl:if test="$type='complet'">
+                            <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+
+                              <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                                
+                              </div>
+                            </td>
+
+                            <td style="padding-right: 0.1cm; border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+
+                              <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                                
+                              </div>
+                            </td>
+
+                            <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+
+                              <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                                
+                              </div>
+                            </td>
+
+                            <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                              <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                              </div>
+                            </td>
+
+                            <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+
+                              <div text-align="right" vertical-align="middle" line-height="0.5cm">
+                               
+                              </div>
+                            </td>
+
+                            <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+
+                              <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                                
+                              </div>
+                            </td>
+                          </xsl:if>
+                          <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                            
+                            <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                              <xsl:value-of select="@tx_om"/>
+                            </div>
+                          </td>
+                          
+                          <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+                            <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                            </div>
+                          </td>
+                        </xsl:if>
+                        
+                        <!--Affichage du premier PEV lorsqu'il y en a plusieurs (même ligne) -->
+                        
+                        <xsl:if test="count(Mj_Pev) > 1">
+                          
+                          <xsl:for-each select="Mj_Pev">
+                            
+                            <xsl:if test="position()=1">
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                                  <xsl:value-of select="@s_tar"/>
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                                  <xsl:value-of select="../@m_eva"/>
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                                  <xsl:value-of select="@af"/>
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                                  <xsl:value-of select="../@nat_loc"/>
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                                  <xsl:value-of select="@cat"/>
+                                </div>
+                              </td>
+                              
+                              <td style="padding-right: 0.1cm; border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div text-align="right" vertical-align="middle" line-height="0.5cm">
+                                  <xsl:value-of select="@revenu_cadastral"/>
+                                </div>
+                              </td>
+
+                              <xsl:if test="$type='complet'">
+                                <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                  <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                                  </div>
+                                </td>
+                              
+                                <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                  <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                                    <xsl:value-of select="@nat_exo"/>
+                                  </div>
+                                </td>
+                              
+                                <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                  <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                                  </div>
+                                </td>
+                              
+                                <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                  <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                                  </div>
+                                </td>
+                              
+                                <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                  <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                                  </div>
+                                </td>
+                              
+                                <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                  <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                                  </div>
+                                </td>
+                              </xsl:if>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                            </xsl:if>
+                          </xsl:for-each>
+                        </xsl:if>
+                      </tr>
+                      <!--Affichage des PEV suivants (lignes suivantes) -->
+                      
+                        
+                        <xsl:for-each select="Mj_Pev">
+                          
+                          <xsl:if test="position()>1">
+                            
+                            <tr>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden; border-left: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden; border-left: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden; border-left: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden; border-left: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                  <xsl:value-of select="@s_tar"/>
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                  <xsl:value-of select="../@m_eva"/>
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                  <xsl:value-of select="@af"/>
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                  <xsl:value-of select="../@nat_loc"/>
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                  <xsl:value-of select="@cat"/>
+                                </div>
+                              </td>
+                              
+                              <td style="padding-right: 0.1cm; border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div text-align="right" vertical-align="middle" line-height="0.3cm">
+                                  <xsl:value-of select="@revenu_cadastral"/>
+                                </div>
+                              </td>
+                              <xsl:if test="$type='complet'">
+                                <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+
+                                  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                  </div>
+                                </td>
+
+                                <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+
+                                  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                    <xsl:value-of select="@nat_exo"/>
+                                  </div>
+                                </td>
+
+                                <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+
+                                  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                  </div>
+                                </td>
+
+                                <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+
+                                  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                  </div>
+                                </td>
+
+                                <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+
+                                  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                  </div>
+                                </td>
+
+                                <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+
+                                  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                  </div>
+                                </td>
+                              </xsl:if>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                            </tr>
+                            
+                            <tr>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden; border-left: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden; border-left: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden; border-left: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden; border-left: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="padding-right: 0.1cm; border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div text-align="right" vertical-align="middle" line-height="0.3cm">
+                                  <xsl:value-of select="../@revenu_cadastral"/>
+                                </div>
+                              </td>
+                              <xsl:if test="$type='complet'">
+                                <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+
+                                  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                  </div>
+                                </td>
+
+                                <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+
+                                  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                  </div>
+                                </td>
+
+                                <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+
+                                  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                  </div>
+                                </td>
+
+                                <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+
+                                  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                  </div>
+                                </td>
+
+                                <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+
+                                  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                  </div>
+                                </td>
+
+                                <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+
+                                  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                  </div>
+                                </td>
+                              </xsl:if>
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                  <xsl:value-of select="../@tx_om"/>
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                            </tr>
+<xsl:if test="count(Mj_Exone_Pev) &gt; 0">
+							 <xsl:for-each select="Mj_Exone_Pev">
+							<tr>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden; border-left: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden; border-left: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden; border-left: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden; border-left: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="padding-right: 0.1cm; border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div text-align="right" vertical-align="middle" line-height="0.3cm">
+                                 
+                                </div>
+                              </td>
+                              <xsl:if test="$type='complet'">
+                                <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+
+                                  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+									 <xsl:value-of select="@coll"/>
+                                  </div>
+                                </td>
+
+                                <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+
+                                  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+								  <xsl:value-of select="@nat_exo"/>
+                                  </div>
+                                </td>
+
+                                <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+
+                                  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+								  <xsl:value-of select="@an_ret"/>
+                                  </div>
+                                </td>
+
+                                <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+
+                                  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+								   <xsl:value-of select="@an_deb"/>
+                                  </div>
+                                </td>
+
+                                <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+
+                                  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+								  <xsl:value-of select="@fraction_rc_exo"/>
+                                  </div>
+                                </td>
+
+                                <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+
+                                  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+									 <xsl:value-of select="@pourc_exo"/>
+                                  </div>
+                                </td>
+                              </xsl:if>
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                  
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                            </tr>
+							</xsl:for-each>
+							</xsl:if>
+                          </xsl:if>
+						  <xsl:if test="position() = 1">
+							<xsl:if test="count(Mj_Exone_Pev) &gt; 0">
+							 <xsl:for-each select="Mj_Exone_Pev">
+							<tr>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden; border-left: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden; border-left: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden; border-left: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden; border-left: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                              
+                              <td style="padding-right: 0.1cm; border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div text-align="right" vertical-align="middle" line-height="0.3cm">
+                                 
+                                </div>
+                              </td>
+                              <xsl:if test="$type='complet'">
+                                <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+
+                                  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+									 <xsl:value-of select="@coll"/>
+                                  </div>
+                                </td>
+
+                                <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+
+                                  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+								  <xsl:value-of select="@nat_exo"/>
+                                  </div>
+                                </td>
+
+                                <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+
+                                  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+								  <xsl:value-of select="@an_ret"/>
+                                  </div>
+                                </td>
+
+                                <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+
+                                  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+								   <xsl:value-of select="@an_deb"/>
+                                  </div>
+                                </td>
+
+                                <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+
+                                  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+								  <xsl:value-of select="@fraction_rc_exo"/>
+                                  </div>
+                                </td>
+
+                                <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+
+                                  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+									 <xsl:value-of select="@pourc_exo"/>
+                                  </div>
+                                </td>
+                              </xsl:if>
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                  
+                                </div>
+                              </td>
+                              
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+                                
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                            </tr>
+							</xsl:for-each>
+							</xsl:if>
+							</xsl:if>
+                        </xsl:for-each>
+                      <!--Affichage des Lot_Local s'il y en a -->
+                      
+                      <xsl:if test="count(Mj_Lot_Local) > 0">
+                        
+                        <xsl:for-each select="Mj_Lot_Local">
+                          
+                          <tr>
+                            
+                            <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                              <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                              </div>
+                            </td>
+                            
+                            <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                              <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                              </div>
+                            </td>
+                            
+                            <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                              <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                              </div>
+                            </td>
+                            
+                            <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                              <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                              </div>
+                            </td>
+                            
+                            <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                              <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                              </div>
+                            </td>
+                            
+                            <td style="padding-left: 0.4cm; border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                              
+                              <div vertical-align="middle" line-height="0.3cm">
+                                <xsl:value-of select="@lot"/>
+                              </div>
+                            </td>
+                           
+                            <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden; border-left: hidden;" valign="top" >
+                              <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                              </div>
+                            </td>
+                            
+                            <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                              <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                              </div>
+                            </td>
+                            
+                            <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden; border-left: hidden;" valign="top">
+                              <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                              </div>
+                            </td>
+                            
+                            <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden; border-left: hidden;" valign="top">
+                              <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                              </div>
+                            </td>
+                            
+                            <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden; border-left: hidden;" valign="top">
+                              <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                              </div>
+                            </td>
+                            
+                            <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                              <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                              </div>
+                            </td>
+                            
+                            <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                              <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                              </div>
+                            </td>
+                            
+                            <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                              <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                              </div>
+                            </td>
+                            
+                            <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                              <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                              </div>
+                            </td>
+                            
+                            <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                              <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                              </div>
+                            </td>
+                            
+                            <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                              <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                              </div>
+                            </td>
+                            
+                            <td style="padding-right: 0.1cm; border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                              <div text-align="right" vertical-align="middle" line-height="0.3cm">
+                              </div>
+                            </td>
+                            <xsl:if test="$type='complet'">
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                            </xsl:if>
+                            
+                            <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-right: hidden; border-bottom: hidden; border-top: hidden;" valign="top">
+                              <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                              </div>
+                            </td>
+                            
+                            <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+                              <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                              </div>
+                            </td>
+                          </tr>
+                        </xsl:for-each>
+                      </xsl:if>
+                    </xsl:for-each>
+                  </tbody>
+                </table>
+              </td>
+            </tr>
+            
+            <!-- Affichage du pied du tableau des proprietes baties -->
+            
+            <tr>
+              
+              <td>
+                
+                <div keep-together="always" keep-with-previous="always">
+                  
+                  <table  table-layout="fixed" width="100%" style="border-collapse: collapse; border-color: black; border-right: 0.5pt; border-left: 0.5pt; border-top: 0pt; border-bottom: 0.5pt; border-style: solid; font-size: 8pt; padding-top: 0.2cm; padding-bottom: 0.1cm;" >
+                    <td width="6.21%" />
+                    <td width="6.9%" />
+                    <td width="8.63%" />
+                    <td width="5.18%" />
+                    <td width="6.9%" />
+                    <td width="8.63%" />
+                    <td width="5.18%" />
+                    <td width="6.9%" />
+                    <td width="8.63%" />
+                    <td width="5.18%" />
+                    <td width="6.9%" />
+                    <td width="23.81%" />
+                    
+                    <tbody>
+                      
+                      <xsl:for-each select="Mj/Mj_Compte_Communal | Mj/Mj_Compte_Communal_Parcelle">
+                        
+                        <tr>
+                          <xsl:if test="$type='complet'">
+                            <td>
+                              <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                            </td>
+
+                            <td>
+                              <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                            </td>
+
+                            <td>
+                              <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                            </td>
+
+                            <td>
+                              <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;">R EXO</div>
+                            </td>
+
+                            <td>
+
+                              <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;">
+                                <xsl:value-of select="@exo_com_bati_float"/>
+
+
+                                EUR
+                              </div>
+                            </td>
+
+                            <td>
+                              <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                            </td>
+
+                            <td>
+                              <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;">R EXO</div>
+                            </td>
+
+                            <td>
+
+                              <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;">
+                                <xsl:value-of select="@exo_dep_bati_float"/>
+
+
+                                EUR
+                              </div>
+                            </td>
+
+                            <td>
+                              <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                            </td>
+
+                            <td>
+                              <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;">R EXO</div>
+                            </td>
+
+                            <td>
+
+                              <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;">
+                                <xsl:value-of select="@exo_reg_bati_float"/>
+
+
+                                EUR
+                              </div>
+                            </td>
+
+                            <td>
+                              <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                            </td>
+                          </xsl:if>
+                        </tr>
+                        
+                        <tr>
+                          
+                          <td>
+                             <div style="text-align: right; line-height: 0.60cm; vertical-align: middle;">REV IMPOSABLE</div>
+                          </td>
+                          
+                          <td>
+
+                            <div style="text-align: right; line-height: 0.60cm; vertical-align: middle;">
+                              <xsl:value-of select="@rev_impo_bati_float"/>
+
+
+                              EUR
+                            </div>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.60cm; vertical-align: middle;">COM</div>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.60cm; vertical-align: middle;">DEP</div>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.60cm; vertical-align: middle;">R</div>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                          </td>
+                        </tr>
+                        
+                        <tr>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;">R IMP</div>
+                          </td>
+                          
+                          <td>
+
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;">
+                              <xsl:value-of select="@rev_impo_com_bati_float"/>
+
+
+                              EUR
+                            </div>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;">R IMP</div>
+                          </td>
+                          
+                          <td>
+
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;">
+                              <xsl:value-of select="@rev_impo_dep_bati_float"/>
+
+
+                              EUR
+                            </div>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;">R IMP</div>
+                          </td>
+                          
+                          <td>
+
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;">
+                              <xsl:value-of select="@rev_impo_reg_bati_float"/>
+
+
+                              EUR
+                            </div>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                          </td>
+                        </tr>
+                      </xsl:for-each>
+                    </tbody>
+                  </table>
+                </div>
+              </td>
+            </tr>
+            <!-- Affichage des proprietes non baties -->
+            
+            <tr>
+              
+              <td>
+                
+                <table table-layout="fixed" width="100%" style="border-collapse: collapse; font-size: 10pt;" CELLSPACING="0" CELLPADDING="0">
+                  <tr>
+                    <td width="2.07%"/>
+                    <td width="5.18%"/>
+                    <td width="4.14%"/>
+                    <td width="4.14%"/>
+                    <xsl:if test="$type='complet'">
+                      <td width="27.26%"/>
+                    </xsl:if>
+                    <xsl:if test="not($type='complet')">
+                      <td width="41.76%"/>
+                    </xsl:if>
+                    <td width="3.11%"/>
+                    <td width="4.83%"/>
+                    <td width="2.07%"/>
+                    <td width="2.07%"/>
+                    <td width="3.11%"/>
+                    <td width="3.80%"/>
+                    <td width="3.45%"/>
+                    <td width="3.11%"/>
+                    <td width="2.42%"/>
+                    <td width="2.42%"/>
+                    <td width="2.42%"/>
+                    <td width="6.9%0"/>
+                    <xsl:if test="$type='complet'">
+                      <td width="3.11%"/>
+                      <td width="2.07%"/>
+                      <td width="2.07%"/>
+                      <td width="5.18%"/>
+                      <td width="2.07%"/>
+                    </xsl:if>
+                    <td width="2.07%"/>
+                  </tr>
+                  <!-- Affichage de l'en-tête des proprietes non baties -->
+                  
+                  <thead>
+                    
+                    <tr>
+                      <xsl:if test="$type='complet'">
+                        <td colspan="23" style="border-color: black; border-style: solid; border-right: hidden; border-left: hidden; border-top: hidden; border-width: 0.5pt; padding-top: 1cm; padding-bottom: 0.1cm;">
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">PROPRIETES NON BATIES</div>
+                        </td>
+                      </xsl:if>
+                      <xsl:if test="not($type='complet')">
+                        <td colspan="18" style="border-color: black; border-style: solid; border-right: hidden; border-left: hidden; border-top: hidden; border-width: 0.5pt; padding-top: 1cm; padding-bottom: 0.1cm;">
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">PROPRIETES NON BATIES</div>
+                        </td>
+                      </xsl:if>
+                    </tr>
+                    
+                    <tr>
+                      
+                      <td colspan="6" style="border-color: black; border-style: solid; border-right: hidden; border-width: 0.5pt;">
+                        <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">DESIGNATION DES PROPRIETES</div>
+                      </td>
+
+                      <xsl:if test="$type='complet'">
+                        <td colspan="17" style="border-color: black; border-style: solid; border-left: hidden; border-width: 0.5pt;">
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">EVALUATION</div>
+                        </td>
+                      </xsl:if>
+                      <xsl:if test="not($type='complet')">
+                        <td colspan="12" style="border-color: black; border-style: solid; border-left: hidden; border-width: 0.5pt;">
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">EVALUATION</div>
+                        </td>
+                      </xsl:if>
+                    </tr>
+                    
+                    <!-- Affichage des titres des colonnes des proprietes non baties -->
+                    
+                    <tr>
+                      
+                      <td style="border-color: black; border-width: 0.5pt; border-style: solid;">
+                        <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">AN</div>
+                      </td>
+                      
+                      <td style="border-color: black; border-width: 0.5pt; border-style: solid;">
+                        <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">SECTION</div>
+                      </td>
+                      
+                      <td style="border-color: black; border-width: 0.5pt; border-style: solid;">
+                        <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">N°PLAN</div>
+                      </td>
+                      
+                      <td style="border-color: black; border-width: 0.5pt; border-style: solid;">
+                        <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">N° Voirie</div>
+                      </td>
+                      
+                      <td style="border-color: black; border-width: 0.5pt; border-style: solid;">
+                        <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">ADRESSE</div>
+                      </td>
+                      
+                      <td style="border-color: black; border-width: 0.5pt; border-style: solid; border-left: hidden;">
+                        <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">CODE RIVOLI</div>
+                      </td>
+                      
+                      <td style="border-color: black; border-width: 0.5pt; border-style: solid;">
+                        <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">N°PARC PRIM</div>
+                      </td>
+                      
+                      <td style="border-color: black; border-width: 0.5pt; border-style: solid; border-right: hidden; border-left: hidden;">
+                        <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">FP DP</div>
+                      </td>
+                      
+                      <td style="border-color: black; border-width: 0.5pt; border-style: solid; border-left: hidden;">
+                        <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">S TAR</div>
+                      </td>
+                      
+                      <td style="border-color: black; border-width: 0.5pt; border-style: solid;">
+                        <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">SUF</div>
+                      </td>
+                      
+                      <td style="border-color: black; border-width: 0.5pt; border-style: solid;">
+                        <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">GR/SS GR</div>
+                      </td>
+                      
+                      <td style="border-color: black; border-width: 0.5pt; border-style: solid;">
+                        <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">CLASSE</div>
+                      </td>
+                      
+                      <td style="border-color: black; border-width: 0.5pt; border-style: solid;">
+                        <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">NAT CULT</div>
+                      </td>
+                      
+                      <!-- Creation d'une table pour afficher le titre de colonne (CONTENANCE HA A CA) -->
+                      
+                      <td colspan="3" style="border-color: black; border-width: 0.5pt; border-style: solid;">
+                        
+                        <table table-layout="fixed" style="font-size: 8pt; border-collapse: collapse;" width="100%">
+                          <tbody>
+                            
+                            <tr>
+                              <td colspan="3" style="padding-top: 0.05cm;">
+                                <div style="text-align: center; vertical-align: middle; line-height: 0.3cm;">CONTENANCE</div>
+                              </td>
+                            </tr>
+                            
+                            <tr>
+                              
+                              <td width="33%">
+                                <div style="text-align: center; vertical-align: middle; line-height: 0.3cm;">HA</div>
+                              </td>
+                              
+                              <td width="33%">
+                                <div style="text-align: center; vertical-align: middle; line-height: 0.3cm;">A</div>
+                              </td>
+                              
+                              <td width="33%">
+                                <div style="text-align: center; vertical-align: middle; line-height: 0.3cm;">CA</div>
+                              </td>
+                            </tr>
+                          </tbody>
+                        </table>
+                      </td>
+                      
+                      <!-- Suite de l'affichage des titres des colonnes des proprietes non baties -->
+                      
+                      <td style="border-color: black; border-width: 0.5pt; border-style: solid;">
+                        <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">REVENU CADASTRAL</div>
+                      </td>
+
+                      <xsl:if test="$type='complet'">
+                        <td style="border-color: black; border-width: 0.5pt; border-style: solid;">
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">COLL</div>
+                        </td>
+
+                        <td style="border-color: black; border-width: 0.5pt; border-style: solid;">
+                          <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">NAT EXO</div>
+                        </td>
+
+                        <td style="border-color: black; border-width: 0.5pt; border-style: solid;">
+                          <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">AN RET</div>
+                        </td>
+
+                        <td style="border-color: black; border-width: 0.5pt; border-style: solid;">
+                          <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">FRACTION RC EXO</div>
+                        </td>
+
+                        <td style="border-color: black; border-width: 0.5pt; border-style: solid;">
+                          <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">% EXO</div>
+                        </td>
+                      </xsl:if>
+                      
+                      <td style="border-color: black; border-width: 0.5pt; border-style: solid;">
+                        <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">POS</div>
+                      </td>
+                    </tr>
+                  </thead>
+                  
+                  <tfoot>
+                    
+                    <tr>
+                      
+                      <td style="border-color: black; border-width: 0.5pt; border-style: solid; border-right: hidden; border-left: hidden;">
+                        <div>
+                        </div>
+                      </td>
+                      
+                      <td style="border-color: black; border-width: 0.5pt; border-style: solid; border-right: hidden; border-left: hidden;">
+                        <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                        </div>
+                      </td>
+                      
+                      <td style="border-color: black; border-width: 0.5pt; border-style: solid; border-right: hidden; border-left: hidden;">
+                        <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                        </div>
+                      </td>
+                      
+                      <td style="border-color: black; border-width: 0.5pt; border-style: solid; border-right: hidden; border-left: hidden;">
+                        <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                        </div>
+                      </td>
+                      
+                      <td style="border-color: black; border-width: 0.5pt; border-style: solid; border-right: hidden; border-left: hidden;">
+                        <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                        </div>
+                      </td>
+                      
+                      <td style="border-color: black; border-width: 0.5pt; border-style: solid; border-right: hidden; border-left: hidden;">
+                        <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                        </div>
+                      </td>
+                      
+                      <td style="border-color: black; border-width: 0.5pt; border-style: solid; border-right: hidden; border-left: hidden;">
+                        <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                        </div>
+                      </td>
+                      
+                      <td style="border-color: black; border-width: 0.5pt; border-style: solid; border-right: hidden; border-left: hidden;">
+                        <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                        </div>
+                      </td>
+                      
+                      <td style="border-color: black; border-width: 0.5pt; border-style: solid; border-right: hidden; border-left: hidden;">
+                        <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                        </div>
+                      </td>
+                      
+                      <td style="border-color: black; border-width: 0.5pt; border-style: solid; border-right: hidden; border-left: hidden;">
+                        <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                        </div>
+                      </td>
+                      
+                      <td style="border-color: black; border-width: 0.5pt; border-style: solid; border-right: hidden; border-left: hidden;">
+                        <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                        </div>
+                      </td>
+                      
+                      <td style="border-color: black; border-width: 0.5pt; border-style: solid; border-right: hidden; border-left: hidden;">
+                        <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                        </div>
+                      </td>
+                      
+                      <td style="border-color: black; border-width: 0.5pt; border-style: solid; border-right: hidden; border-left: hidden;">
+                        <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                        </div>
+                      </td>
+                      
+                      <td colspan="3" style="border-color: black; border-width: 0.5pt; border-style: solid; border-right: hidden; border-left: hidden;">
+                        <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                        </div>
+                      </td>
+                      
+                      <td style="border-color: black; border-width: 0.5pt; border-style: solid; border-right: hidden; border-left: hidden;">
+                        <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                        </div>
+                      </td>
+
+                      <xsl:if test="$type='complet'">
+                        <td style="border-color: black; border-width: 0.5pt; border-style: solid; border-right: hidden; border-left: hidden;">
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                          </div>
+                        </td>
+
+                        <td style="border-color: black; border-width: 0.5pt; border-style: solid; border-right: hidden; border-left: hidden;">
+                          <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                          </div>
+                        </td>
+
+                        <td style="border-color: black; border-width: 0.5pt; border-style: solid; border-right: hidden; border-left: hidden;">
+                          <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                          </div>
+                        </td>
+
+                        <td style="border-color: black; border-width: 0.5pt; border-style: solid; border-right: hidden; border-left: hidden;">
+                          <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                          </div>
+                        </td>
+
+                        <td style="border-color: black; border-width: 0.5pt; border-style: solid; border-right: hidden; border-left: hidden;">
+                          <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                          </div>
+                        </td>
+                      </xsl:if>
+                      
+                      <td style="border-color: black; border-width: 0.5pt; border-style: solid; border-right: hidden;  border-left: hidden;">
+                        <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                        </div>
+                      </td>
+                    </tr>
+                  </tfoot>
+                  <!-- Affichage des donnees des proprietes non baties -->
+                  
+                  <tbody>
+                    
+                    <tr>
+                      
+                      <td>
+                        <div>
+                        </div>
+                      </td>
+                    </tr>
+                    
+                    <xsl:for-each select="Mj/Mj_Compte_Communal/Mj_Parcelle | Mj/Mj_Compte_Communal_Parcelle/Mj_Parcelle">
+						<xsl:sort select="@section" />
+						<xsl:sort select="@num_plan" data-type="number"/>
+                      <tr>
+                        
+                        <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+                          
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                            <xsl:value-of select="@date"/>
+                          </div>
+                        </td>
+                        
+                        <td style="padding-right:0.1cm; border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+                          
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                            <xsl:value-of select="@section"/>
+                          </div>
+                        </td>
+                        
+                        <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+                          
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                            <xsl:value-of select="@num_plan"/>
+                          </div>
+                        </td>
+                        
+                        <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+                          
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                            <xsl:value-of select="@num_voirie"/>
+                          </div>
+                        </td>
+                        
+                        <td style="padding-left:0.1cm; border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+                          
+                          <div vertical-align="middle" line-height="0.5cm">
+                            <xsl:value-of select="@adresse"/>
+                          </div>
+                        </td>
+                        
+                        <td style="padding-left:0.1cm; border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden; border-left: hidden;" valign="top">
+                          
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                            <xsl:value-of select="@code_rivoli"/>
+                          </div>
+                        </td>
+                        
+                        <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+                          
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                            <xsl:value-of select="@num_parc_prim"/>
+                          </div>
+                        </td>
+                        
+                        <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden; border-left: hidden;" valign="top">
+                          
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                            <xsl:value-of select="@fp_dp"/>
+                          </div>
+                        </td>
+                        
+                        <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden; border-left: hidden;" valign="top">
+                          
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                            <xsl:value-of select="@s_tar"/>
+                          </div>
+                        </td>
+                        
+                        <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+                          
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                            <xsl:value-of select="@suf"/>
+                          </div>
+                        </td>
+                        
+                        <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+                          
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                            <xsl:value-of select="@grss_gr"/>
+                          </div>
+                        </td>
+                        
+                        <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+                          
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                            <xsl:value-of select="@clas"/>
+                          </div>
+                        </td>
+                        
+                        <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+                          
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                            <xsl:value-of select="@nat_cult"/>
+                          </div>
+                        </td>
+                        
+                        <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+                          
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                            <xsl:value-of select="@ha"/>
+                          </div>
+                        </td>
+                        
+                        <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden; border-left: hidden;" valign="top">
+                          
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                            <xsl:value-of select="@a"/>
+                          </div>
+                        </td>
+                        
+                        <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden; border-left: hidden;" valign="top">
+                          
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                            <xsl:value-of select="@ca"/>
+                          </div>
+                        </td>
+                        
+                        <!-- Affichage de la colonne revenu cadastral lorsqu'il a une seule suf -->
+                        
+                        <xsl:if test="count(Mj_Suf)=1">
+                          
+                          <td style="padding-right:0.1cm; border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+                            
+                            <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                              <xsl:value-of select="@revenu_cadastral"/>
+                            </div>
+                          </td>
+						   <xsl:if test="$type='complet'">
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                  <xsl:value-of select="Mj_Suf/@nat_exo"/>
+                                </div>
+                              </td>
+
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+
+                              <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+                                <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                                </div>
+                              </td>
+                            </xsl:if>
+                            <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+                              <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+                              </div>
+                            </td>
+                        </xsl:if>
+                        
+                        <!-- Affichage de la colonne revenu cadastral lorsqu'il a plusieurs sufs -->
+                        
+                        <xsl:if test="count(Mj_Suf) > 1">
+                          
+                          <td style="padding-right:0.1cm; border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+                            <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                            </div>
+                          </td>
+						  <xsl:if test="$type='complet'">
+                          <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+                            <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                            </div>
+                          </td>
+
+                          <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+
+                            <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                              <xsl:value-of select="Mj_Suf/@nat_exo"/>
+                            </div>
+                          </td>
+
+                          <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+                            <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                            </div>
+                          </td>
+
+                          <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+                            <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                            </div>
+                          </td>
+
+                          <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+                            <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                            </div>
+                          </td>
+                        </xsl:if>
+                        
+                        <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+                          <div style="text-align: center; line-height: 0.5cm; vertical-align: middle;">
+                          </div>
+                        </td>
+                        </xsl:if>
+                        
+                        <!-- Suite de l'affichage des donnees des proprietes non baties -->
+                        
+                      </tr>
+					
+                      <!-- Affichage des Suf lorsqu'il y en a plusieurs -->
+                      <xsl:choose>
+							<xsl:when test="count(Mj_Suf) > 1">
+                        
+								<xsl:for-each select="Mj_Suf">
+								  
+								  <tr>
+									
+									<td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+									  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+									  </div>
+									</td>
+									
+									<td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+									  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+									  </div>
+									</td>
+									
+									<td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+									  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+									  </div>
+									</td>
+									
+									<td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+									  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+									  </div>
+									</td>
+									
+									<td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+									  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+									  </div>
+									</td>
+									
+									<td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden; border-left: hidden;" valign="top">
+									  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+									  </div>
+									</td>
+									
+									<td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+									  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+									  </div>
+									</td>
+									
+									<td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden; border-left: hidden;" valign="top">
+									  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+									  </div>
+									</td>
+									
+									<td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden; border-left: hidden;" valign="top">
+									  
+									  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+										<xsl:value-of select="@s_tar"/>
+									  </div>
+									</td>
+									
+									<td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+									  
+									  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+										<xsl:value-of select="@suf"/>
+									  </div>
+									</td>
+									
+									<td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+									  
+									  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+										<xsl:value-of select="@grss_gr"/>
+									  </div>
+									</td>
+									
+									<td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+									  
+									  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+										<xsl:value-of select="@clas"/>
+									  </div>
+									</td>
+									
+									<td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+									  
+									  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+										<xsl:value-of select="@nat_cult"/>
+									  </div>
+									</td>
+									
+									<td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+									  
+									  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+										<xsl:value-of select="@ha"/>
+									  </div>
+									</td>
+									
+									<td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden; border-left: hidden;" valign="top">
+									  
+									  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+										<xsl:value-of select="@a"/>
+									  </div>
+									</td>
+									
+									<td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden; border-left: hidden;" valign="top">
+									  
+									  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+										<xsl:value-of select="@ca"/>
+									  </div>
+									</td>
+									
+									<td style="padding-right: 0.1cm; border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+									  
+									  <div style="text-align: center;line-height: 0.3cm; vertical-align: middle;" >
+										<xsl:value-of select="@revenu_cadastral"/>
+									  </div>
+									</td>
+									<xsl:if test="$type='complet'">
+									  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+										<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+										</div>
+									  </td>
+
+									  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+
+										<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+										  <xsl:value-of select="@nat_exo"/>
+										</div>
+									  </td>
+
+									  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+										<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+										</div>
+									  </td>
+
+									  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+										<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+										</div>
+									  </td>
+
+									  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+										<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+										</div>
+									  </td>
+									</xsl:if>
+									<td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+									  <div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+									  </div>
+									</td>
+								  </tr>
+								  <xsl:if test="$type='complet'">
+									<!-- Affichage des Exon_Suf lorsqu'il y en a -->
+									<xsl:if test="count(Mj_Exon_Suf) &gt; 0">
+									  <xsl:for-each select="Mj_Exon_Suf">
+										<tr>
+										  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="border-left: hidden; border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="padding-right: 0.1cm; border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;border-left: hidden;" valign="top">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="border-left: hidden; border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;border-right: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="border-left: hidden; padding-right: 0.1cm; border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;border-right: hidden;border-left: hidden;" valign="top">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="padding-right: 0.1cm; border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="border-rigth: hidden; border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="border-rigth: hidden; padding-right: 0.1cm; border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;border-left: hidden;border-right: hidden;" valign="top">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="border-left: hidden; padding-right: 0.1cm; border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;border-left: hidden;" valign="top">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="padding-right: 0.1cm; border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											  <xsl:value-of select="@ccolloc" />
+											</div>
+										  </td>
+
+										  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											  <xsl:value-of select="@nat_exo" />
+											</div>
+										  </td>
+
+										  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											  <xsl:value-of select="@pexn div 100" />
+											</div>
+										  </td>
+
+										  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											  <xsl:value-of select="@rcexnba div 100" />
+											</div>
+										  </td>
+
+										  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+										</tr>
+									  </xsl:for-each>
+									</xsl:if>
+								  </xsl:if>
+								</xsl:for-each>
+							  </xsl:when>
+							  <xsl:when test="count(Mj_Suf)>0">
+								<xsl:if test="$type='complet'">
+								 <xsl:for-each select="Mj_Suf">
+									<!-- Affichage des Exon_Suf lorsqu'il y en a -->
+									<xsl:if test="count(Mj_Exon_Suf) &gt; 0">
+									  <xsl:for-each select="Mj_Exon_Suf">
+										<tr>
+										  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="border-left: hidden; border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="padding-right: 0.1cm; border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;border-left: hidden;" valign="top">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="border-left: hidden; border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;border-right: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="border-left: hidden; padding-right: 0.1cm; border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;border-right: hidden;border-left: hidden;" valign="top">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="padding-right: 0.1cm; border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="border-rigth: hidden; border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="border-rigth: hidden; padding-right: 0.1cm; border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;border-left: hidden;border-right: hidden;" valign="top">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="border-left: hidden; padding-right: 0.1cm; border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;border-left: hidden;" valign="top">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="padding-right: 0.1cm; border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;" valign="top">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											  <xsl:value-of select="@ccolloc" />
+											</div>
+										  </td>
+
+										  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											  <xsl:value-of select="@nat_exo" />
+											</div>
+										  </td>
+
+										  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											  <xsl:value-of select="@pexn div 100" />
+											</div>
+										  </td>
+
+										  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											  <xsl:value-of select="@rcexnba div 100" />
+											</div>
+										  </td>
+
+										  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+
+										  <td style="border-style: solid; border-width: 0.5pt; border-color: black; border-bottom: hidden; border-top: hidden;">
+											<div style="text-align: center; line-height: 0.3cm; vertical-align: middle;">
+											</div>
+										  </td>
+										</tr>
+									  </xsl:for-each>
+									</xsl:if>
+									</xsl:for-each>
+									</xsl:if>
+								 </xsl:when>
+						</xsl:choose>
+                    </xsl:for-each>
+                  </tbody>
+                </table>
+              </td>
+            </tr>
+            
+            <!-- Affichage du pied du tableau des proprietes non baties -->
+            
+            <tr>
+              
+              <td>
+                
+                <div keep-together="always" keep-with-previous="always">
+                  
+                  <table width="100%" table-layout="fixed" style="border-color: black; border-right: 0.5pt; border-left: 0.5pt; border-top: 0pt; border-bottom: 0.5pt; border-style: solid; border-collapse: collapse; font-size: 8pt; padding-top: 0.2cm; padding-bottom: 0.1cm;">
+
+                    <td width="3.45%" />
+                    <td width="3.45%" />
+                    <td width="3.45%" />
+                    <td width="3.45%" />
+                    <td width="13.46%" />
+                    <td width="6.9%" />
+                    <td width="6.9%" />
+                    <td width="5.18%" />
+                    <td width="6.9%" />
+                    <td width="6.9%" />
+                    <td width="5.18%" />
+                    <td width="6.9%" />
+                    <td width="6.9%" />
+                    <td width="5.18%" />
+                    <td width="6.9%" />
+                    <td width="7.94%" />
+                    
+                    <tbody>
+                      
+                      <xsl:for-each select="Mj/Mj_Compte_Communal | Mj/Mj_Compte_Communal_Parcelle">
+                        
+                        <tr>
+
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;">
+                            </div>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: center; line-height: 0.20cm; vertical-align: middle;">HA</div>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: center; line-height: 0.20cm; vertical-align: middle;">A</div>
+                          </td>
+
+                          <td>
+                            <div style="text-align: center; line-height: 0.20cm; vertical-align: middle;">CA</div>
+                          </td>
+                          <xsl:if test="$type='complet'">
+                            <td>
+                              <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                            </td>
+
+                            <td>
+                              <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                            </td>
+
+                            <td>
+                              <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                            </td>
+
+                            <td>
+                              <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;">R EXO</div>
+                            </td>
+
+                            <td>
+
+                              <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;">
+                                <xsl:value-of select="@exo_com_par_float"/>
+
+
+                                EUR
+                              </div>
+                            </td>
+
+                            <td>
+                              <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                            </td>
+
+                            <td>
+                              <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;">R EXO</div>
+                            </td>
+
+                            <td>
+
+                              <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;">
+                                <xsl:value-of select="@exo_tax_ad_par_float"/>
+
+
+                                EUR
+                              </div>
+                            </td>
+
+                            <td>
+                              <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                            </td>
+
+                            <td>
+                              <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"></div>
+                            </td>
+
+                            <td>
+
+                              <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;">
+                              </div>
+                            </td>
+
+                            <td>
+                              <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                            </td>
+                          </xsl:if>
+                        </tr>
+                        
+                        <tr>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.60cm; vertical-align: middle;">CONT</div>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.60cm; vertical-align: middle;">REV IMPOSABLE</div>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.60cm; vertical-align: middle;">
+                              <xsl:value-of select="@rev_impo_par_float"/>
+
+
+                              EUR
+                            </div>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.60cm; vertical-align: middle;">COM</div>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.60cm; vertical-align: middle;">TAXE AD</div>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.60cm; vertical-align: middle;"></div>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                          </td>
+                          
+                          <td padding-right="0.8cm">
+                            <div style="text-align: right; line-height: 0.60cm; vertical-align: middle;">MAJ POS</div>
+                          </td>
+                        </tr>
+                        
+                        <tr>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;">
+                            </div>
+                          </td>
+                          
+                          <td>
+                            
+                            <div style="text-align: center; line-height: 0.20cm; vertical-align: middle;">
+                              <xsl:value-of select="@ha"/>
+                            </div>
+                          </td>
+                          
+                          <td>
+                            
+                            <div style="text-align: center; line-height: 0.20cm; vertical-align: middle;">
+                              <xsl:value-of select="@a"/>
+                            </div>
+                          </td>
+                          
+                          <td>
+                            
+                            <div style="text-align: center; line-height: 0.20cm; vertical-align: middle;">
+                              <xsl:value-of select="@ca"/>
+                            </div>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;">R IMP</div>
+                          </td>
+                          
+                          <td>
+                            
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;">
+                              <xsl:value-of select="@rev_impo_com_par_float"/>
+
+
+                              EUR
+                            </div>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;">R IMP</div>
+                          </td>
+                          
+                          <td>
+                            
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;">
+                              <xsl:value-of select="@rev_impo_taxe_ad_par_float"/>
+
+
+                              EUR
+                            </div>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"></div>
+                          </td>
+                          
+                          <td>
+                            
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;">
+                            </div>
+                          </td>
+                          
+                          <td>
+                            <div style="text-align: right; line-height: 0.20cm; vertical-align: middle;"/>
+                          </td>
+                        </tr>
+                      </xsl:for-each>
+                    </tbody>
+                    
+                    <!-- Fin de la table du pied du tableau des propiétés non baties -->
+                  </table>
+                </div>
+              </td>
+            </tr>
+            <!-- Fin du corps du tableau global -->
+          </tbody>
+          <!-- Fin du tableau global -->
+        </table>
+      </body>
+    </html>
+  </xsl:template>
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/src/module_cadastreV2/web_service/class/majic_libV2/xsl/fo2html.xsl b/src/module_cadastreV2/web_service/class/majic_libV2/xsl/fo2html.xsl
new file mode 100755
index 0000000000000000000000000000000000000000..a4ca0b5740c2d846731cbd7d9ae1e55b5641b8bc
--- /dev/null
+++ b/src/module_cadastreV2/web_service/class/majic_libV2/xsl/fo2html.xsl
@@ -0,0 +1,643 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!-- =============================================================== -->
+<!--                                                                 -->
+<!-- Convert XSL FO (as in REC 2001-10-15) to HTML                    -->
+<!--                                                                 -->
+<!-- � RenderX 2000-2001                                             -->
+<!-- Permission to copy and modify is granted, provided this notice  -->
+<!-- is included in all copies and/or derived work.                  -->
+<!--                                                                 -->
+<!-- Author: Nikolai Grigoriev, grig@renderx.com                     -->
+<!--                                                                 -->
+<!-- =============================================================== -->
+<!DOCTYPE xsl:stylesheet [
+  <!ENTITY anchor "<xsl:apply-templates select='@id' xmlns:xsl='http://www.w3.org/1999/XSL/Transform'/>">
+  <!ENTITY add-style "<xsl:call-template name='add-style-attribute' xmlns:xsl='http://www.w3.org/1999/XSL/Transform'/>">
+]>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format" exclude-result-prefixes="fo">
+
+<xsl:output method="html" version="4.0" encoding="utf-8" doctype-public="-//W3C//DTD HTML 4.0 Transitional//EN" indent="no"/>
+
+<!-- =============================================================== -->
+<!-- Root. Create the bone and call templates for each page sequence -->
+<!-- =============================================================== -->
+
+<xsl:template match="fo:root">
+  <html>
+    <head>
+      <title>
+        <xsl:choose>
+          <xsl:when test="descendant::fo:title[1]">
+            <xsl:value-of select="fo:title"/>
+          </xsl:when>
+          <xsl:otherwise>XSL FO Document</xsl:otherwise>
+        </xsl:choose>
+      </title>
+      <META http-equiv="Content-Style-Type" content="text/css"/>
+      <style type="text/css">
+        a { color: black; border: none; text-decoration: none; }
+        img { border: none; }
+      </style>
+    </head>
+
+    <body bgcolor="white" marginwidth="6" marginheight="6" leftmargin="6" topmargin="6">
+      <xsl:apply-templates select="fo:page-sequence"/>
+    </body>
+  </html>
+
+</xsl:template>
+
+<!-- =============================================================== -->
+<!-- fo:page-sequence. Draws a header before and a footer after.     -->
+<!-- Sidebars are skipped: there's no way to rotate the text in HTML -->
+<!-- and horizontal text in the sidebars eats up too much space.     -->
+<!-- =============================================================== -->
+
+<xsl:template match="fo:page-sequence">
+
+    <xsl:variable name="current-master"><xsl:value-of select="@master-reference"/></xsl:variable>
+
+    <!-- One page master will be used for the whole page sequence -->
+    <xsl:variable name="page-master-name">
+      <xsl:choose>
+        <xsl:when test="../fo:layout-master-set/fo:simple-page-master[@master-name=$current-master]">
+          <!-- specified master is a page master: use it -->
+          <xsl:value-of select="$current-master"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <!-- specified master is a page sequence master: -->
+          <!-- find master name for the first page -->
+          <xsl:apply-templates select="../fo:layout-master-set/fo:page-sequence-master[@master-name=$current-master]"/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+
+    <!-- Load the page master into a variable. No problem if it's null; should work the same ;-) -->
+    <xsl:variable name="page-master" select="../fo:layout-master-set/fo:simple-page-master[@master-name=$page-master-name]"/>
+
+
+    <!-- Start real drawing -->
+    <br/>  <!-- make an offset before each page sequence -->
+
+    <!-- Header -->
+    <xsl:variable name="header-region" select="$page-master/fo:region-before"/>
+    <xsl:apply-templates select="fo:static-content[@flow-name = $header-region/@region-name                               or (@flow-name='xsl-region-before' and not($header-region/@region-name))]">
+      <xsl:with-param name="region" select="$header-region"/>
+    </xsl:apply-templates>
+
+    <!-- Body -->
+    <xsl:apply-templates select="fo:flow">
+      <xsl:with-param name="region" select="$page-master/fo:region-body"/>
+    </xsl:apply-templates>
+
+    <!-- Footer -->
+    <xsl:variable name="footer-region" select="$page-master/fo:region-after"/>
+    <xsl:apply-templates select="fo:static-content[@flow-name = $footer-region/@region-name                               or (@flow-name='xsl-region-after' and not($footer-region/@region-name))]">
+      <xsl:with-param name="region" select="$footer-region"/>
+    </xsl:apply-templates>
+
+    <br/>  <!-- make an offset after each page sequence -->
+
+</xsl:template>
+
+<!-- =============================================================== -->
+<!-- fo:block                                                        -->
+<!-- =============================================================== -->
+
+<xsl:template match="fo:block">
+  <xsl:apply-templates select="@id" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"/><div><xsl:call-template name="add-style-attribute" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"/><xsl:apply-templates mode="check-for-pre"/></div>
+</xsl:template>
+
+<!-- =============================================================== -->
+<!-- fo:inline-sequence                                              -->
+<!-- =============================================================== -->
+
+<xsl:template match="fo:inline | fo:wrapper">
+  <xsl:apply-templates select="@id" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"/><span><xsl:call-template name="add-style-attribute" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"/><xsl:apply-templates/></span>
+</xsl:template>
+
+<!-- =============================================================== -->
+<!-- fo:list-block                                                   -->
+<!-- =============================================================== -->
+
+<xsl:template match="fo:list-block">
+  <xsl:variable name="label-separation">
+    <xsl:choose>
+      <xsl:when test="@provisional-label-separation">
+        <xsl:apply-templates select="@provisional-label-separation" mode="convert-to-pixels"/>
+      </xsl:when>
+      <xsl:otherwise>8</xsl:otherwise>
+    </xsl:choose>
+  </xsl:variable>
+
+  <xsl:variable name="body-offset">
+    <xsl:choose>
+      <xsl:when test="@provisional-distance-between-starts">
+        <xsl:apply-templates select="@provisional-distance-between-starts" mode="convert-to-pixels"/>
+      </xsl:when>
+      <xsl:otherwise>32</xsl:otherwise>
+    </xsl:choose>
+  </xsl:variable>
+
+  <div><xsl:call-template name="add-style-attribute" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"/>
+    <xsl:apply-templates select="@id" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"/>
+    <table width="100%">
+      <xsl:apply-templates select="fo:list-item | fo:list-item-label">
+        <xsl:with-param name="label-width" select="$body-offset - $label-separation"/>
+        <xsl:with-param name="gap-width" select="$label-separation"/>
+      </xsl:apply-templates>
+    </table>
+  </div>
+
+</xsl:template>
+
+<!-- =============================================================== -->
+<!-- fo:list-item                                                    -->
+<!-- =============================================================== -->
+
+<xsl:template match="fo:list-item">
+  <xsl:param name="label-width"/>
+  <xsl:param name="gap-width"/>
+
+  <tr><xsl:call-template name="add-style-attribute" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"/>
+    <xsl:apply-templates select="fo:list-item-label" mode="draw-cell">
+       <xsl:with-param name="width" select="$label-width"/>
+    </xsl:apply-templates>
+    <xsl:if test="$gap-width &gt; 0">
+      <td width="{$gap-width}">�</td>
+    </xsl:if>
+
+    <xsl:apply-templates select="fo:list-item-body" mode="draw-cell"/>
+  </tr>
+</xsl:template>
+
+<!-- =============================================================== -->
+<!-- fo:list-item-label - itemless lists                             -->
+<!-- =============================================================== -->
+
+<xsl:template match="fo:list-block/fo:list-item-label">
+  <xsl:param name="label-width"/>
+  <xsl:param name="gap-width"/>
+
+  <tr>
+    <xsl:apply-templates select="." mode="draw-cell">
+       <xsl:with-param name="width" select="$label-width"/>
+    </xsl:apply-templates>
+    <xsl:if test="$gap-width &gt; 0">
+      <td width="{$gap-width}">�</td>
+    </xsl:if>
+
+    <xsl:apply-templates select="following-sibling::fo:list-item-body[1]" mode="draw-cell"/>
+  </tr>
+</xsl:template>
+
+
+<!-- =============================================================== -->
+<!-- fo:list-item-body - itemless lists                              -->
+<!-- =============================================================== -->
+
+<xsl:template match="fo:list-item-label | fo:list-item-body" mode="draw-cell">
+  <xsl:param name="width" select="'auto'"/>
+  <td valign="top"><xsl:call-template name="add-style-attribute" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"/><xsl:apply-templates select="@id" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"/>
+    <xsl:if test="$width != 'auto'">
+      <xsl:attribute name="width">
+        <xsl:value-of select="$width"/>
+      </xsl:attribute>
+    </xsl:if>
+
+    <xsl:apply-templates mode="check-for-pre"/>
+  </td>
+</xsl:template>
+
+
+<!-- =============================================================== -->
+<!-- fo:table and its components                                     -->
+<!-- =============================================================== -->
+
+<xsl:template match="fo:table">
+  <xsl:apply-templates select="@id" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"/>
+  <table><xsl:call-template name="add-style-attribute" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"/>
+    <xsl:if test="not(@display-align)">
+      <xsl:attribute name="valign">top</xsl:attribute>
+	  <xsl:attribute name="width">100%</xsl:attribute>
+	  <xsl:attribute name="CELLSPACING">0</xsl:attribute>
+	  <xsl:attribute name="CELLPADDING">0</xsl:attribute>
+    </xsl:if>
+
+    <xsl:apply-templates/>
+  </table>
+</xsl:template>
+
+<xsl:template match="fo:table-header">
+  <thead><xsl:call-template name="add-style-attribute" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"/>
+    <xsl:apply-templates/>
+  </thead>
+</xsl:template>
+
+<xsl:template match="fo:table-footer">
+  <tfoot><xsl:call-template name="add-style-attribute" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"/>
+    <xsl:apply-templates/>
+  </tfoot>
+</xsl:template>
+
+<xsl:template match="fo:table-body">
+  <tbody><xsl:call-template name="add-style-attribute" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"/>
+    <xsl:apply-templates/>
+  </tbody>
+</xsl:template>
+
+<xsl:template match="fo:table-row">
+  <tr><xsl:call-template name="add-style-attribute" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"/>
+    <xsl:apply-templates mode="display"/>
+  </tr>
+</xsl:template>
+
+<xsl:template match="fo:table-cell" mode="display">
+  <td><xsl:call-template name="add-style-attribute" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"/>
+    <xsl:if test="not(@display-align)">
+      <xsl:attribute name="valign">top</xsl:attribute>
+	  <!-- <xsl:attribute name="style">border-right:true</xsl:attribute>-->
+    </xsl:if>
+	
+    <xsl:apply-templates select="@*" mode="get-table-attributes"/>
+    <xsl:apply-templates mode="check-for-pre"/>
+  </td>
+</xsl:template>
+
+<xsl:template match="fo:table-cell" priority="-1"/>
+
+<!-- This template accounts for "rowless" tables -->
+<xsl:template priority="1" match="fo:table-cell[not(parent::fo:table-row)]               [not(preceding-sibling::fo:table-cell) or @starts-row='true'                or preceding-sibling::fo:table-cell[1][@ends-row='true']]">
+  <tr>
+    <xsl:call-template name="enumerate-rowless-cells"/>
+  </tr>
+</xsl:template>
+
+<xsl:template name="enumerate-rowless-cells">
+  <xsl:apply-templates select="." mode="display"/>
+  <xsl:if test="not(@ends-row='true')">
+    <xsl:for-each select="following-sibling::fo:table-cell[1]                           [not(@starts-row='true')]">
+      <xsl:call-template name="enumerate-rowless-cells"/>
+    </xsl:for-each>
+  </xsl:if>
+</xsl:template>
+
+
+<!-- =============================================================== -->
+<!-- fo:inline-graphic                                               -->
+<!-- =============================================================== -->
+
+<xsl:template match="fo:external-graphic">
+  <xsl:variable name="cleaned-url">
+    <xsl:apply-templates select="@src" mode="unbracket-url"/>
+  </xsl:variable>
+  <xsl:apply-templates select="@id" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"/><img src="{$cleaned-url}"><xsl:apply-templates select="@height|@width|@*[starts-with(name(),'border')]"/></img>
+</xsl:template>
+
+<!-- =============================================================== -->
+<!-- fo:basic-link                                                  -->
+<!-- =============================================================== -->
+
+<xsl:template match="fo:basic-link[@external-destination]">
+
+  <xsl:variable name="cleaned-url">
+    <xsl:apply-templates select="@external-destination" mode="unbracket-url"/>
+  </xsl:variable>
+
+  <xsl:apply-templates select="@id" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"/><a href="{$cleaned-url}"><xsl:call-template name="add-style-attribute" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"/><xsl:apply-templates/></a>
+</xsl:template>
+
+<xsl:template match="fo:basic-link[@internal-destination]">
+  <xsl:apply-templates select="@id" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"/><a href="#{@internal-destination}"><xsl:call-template name="add-style-attribute" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"/><xsl:apply-templates/></a>
+</xsl:template>
+
+
+<!-- =============================================================== -->
+<!-- fo:marker/fo:retrieve-marker                                    -->
+<!-- =============================================================== -->
+
+<xsl:template match="fo:marker"/>
+<xsl:template match="fo:marker" mode="retrieve-marker">
+  <xsl:apply-templates/>
+</xsl:template>
+
+<xsl:template match="fo:retrieve-marker">
+
+  <xsl:variable name="class-name" select="@retrieve-class-name"/>
+  <xsl:variable name="matching-markers" select="ancestor::fo:page-sequence/descendant::fo:marker[@marker-class-name=$class-name]"/>
+
+  <xsl:choose>
+    <xsl:when test="@retrieve-position='last-starting-within-page'                  or @retrieve-position='last-ending-within-page'">
+      <xsl:apply-templates select="$matching-markers[position()=last()]" mode="retrieve-marker"/>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:apply-templates select="$matching-markers[1]" mode="retrieve-marker"/>
+    </xsl:otherwise>
+  </xsl:choose>
+
+</xsl:template>
+
+
+
+
+
+<!-- *************************************************************** -->
+<!-- Treatment of attributes that are either identical to their CSS1 -->
+<!-- counterparts, of find an equivalent expression there            -->
+
+<!-- =============================================================== -->
+<!-- Default rule: copy CSS1 attributes and suppress all other       -->
+<!-- =============================================================== -->
+
+<xsl:template match="@*" priority="-2" mode="collect-style-attributes"/>
+
+<xsl:template match="@color |                      @background |                      @background-color |                      @background-image |                      @background-position |                      @background-repeat |                      @padding |                      @padding-top |                      @padding-bottom |                      @padding-right |                      @padding-left |                      @margin |                      @margin-top |                      @margin-bottom |                      @margin-right |                      @margin-left |                      @border |                     @border-width |                      @border-top-width |                      @border-bottom-width |                      @border-right-width |                      @border-left-width |                      @border-color |                      @border-top-color |                      @border-bottom-color |                      @border-right-color |                      @border-left-color |                      @border-style |                      @border-top-style |                      @border-bottom-style |                      @border-right-style |                      @border-left-style |                      @letter-spacing |                      @word-spacing |                      @line-height |                      @font |                      @font-family |                      @font-size |                      @font-weight |                      @font-style |                      @font-variant |                      @vertical-align |                      @text-decoration |                      @text-indent |                      @text-transform" mode="collect-style-attributes">
+  <xsl:value-of select="name()"/>
+  <xsl:text>: </xsl:text>
+  <xsl:value-of select="."/>
+  <xsl:text>; </xsl:text>
+</xsl:template>
+
+<!-- =============================================================== -->
+<!-- Some attributes deserve special treatment -->
+
+<xsl:template match="@text-align" mode="collect-style-attributes">
+  <xsl:text>text-align: </xsl:text>
+  <xsl:choose>
+    <xsl:when test=".='start' or .='inside'">left</xsl:when>
+    <xsl:when test=".='end' or .='outside'">right</xsl:when>
+    <xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
+  </xsl:choose>
+  <xsl:text>; </xsl:text>
+</xsl:template>
+
+<!-- =============================================================== -->
+<!-- Handling writing-mode in borders, padding, and margins          -->
+<!-- This version presumes lr-tb writing mode only.                  -->
+
+<xsl:template match="@space-before.optimum |                      @space-before [not (../@space-before.optimum)] |                      @space-before.minimum [not (../@space-before.optimum) and not (../@space-before)] |                      @space-before.maximum [not (../@space-before.optimum) and not (../@space-before) and not (../@space-before.minimum)] |                      @space-after.optimum |                      @space-after [not (../@space-after.optimum)] |                      @space-after.minimum [not (../@space-after.optimum) and not (../@space-after)] |                      @space-after.maximum [not (../@space-after.optimum) and not (../@space-after) and not (../@space-after.minimum)] |                      @space-start.optimum |                      @space-start [not (../@space-start.optimum)] |                      @space-start.minimum [not (../@space-start.optimum) and not (../@space-start)] |                      @space-start.maximum [not (../@space-start.optimum) and not (../@space-start) and not (../@space-start.minimum)] |                      @space-end.optimum |                      @space-end [not (../@space-end.optimum)] |                      @space-end.minimum [not (../@space-end.optimum) and not (../@space-end)] |                      @space-end.maximum [not (../@space-end.optimum) and not (../@space-end) and not (../@space-end.minimum)] |                      @start-indent[not(parent::fo:list-item-body)] |                      @end-indent[not(parent::fo:list-item-label)] |                      @padding-before |                      @padding-before.length |                      @margin-before |                      @border-before |                      @border-before-width |                      @border-before-width.length |                      @border-before-color |                      @border-before-style |                      @padding-after |                      @padding-after.length |                      @margin-after |                      @border-after |                      @border-after-width |                      @border-after-width.length |                      @border-after-color |                      @border-after-style |                      @padding-start |                      @padding-start.length |                      @margin-start |                      @border-start |                      @border-start-width |                      @border-start-width.length |                      @border-start-color |                      @border-start-style |                      @padding-end |                      @padding-end.length |                      @margin-end |                      @border-end |                      @border-end-width |                      @border-end-width.length |                      @border-end-color |                      @border-end-style" mode="collect-style-attributes">
+
+  <xsl:variable name="property">
+    <xsl:choose>
+      <xsl:when test="starts-with(name(), 'border')">border</xsl:when>
+      <xsl:when test="starts-with(name(), 'padding')">padding</xsl:when>
+      <xsl:when test="starts-with(name(), 'margin')">margin</xsl:when>
+      <xsl:when test="starts-with(name(), 'space')">margin</xsl:when>
+      <xsl:when test="contains(name(), '-indent')">margin</xsl:when>
+    </xsl:choose>
+  </xsl:variable>
+
+  <xsl:variable name="side">
+    <xsl:choose>
+      <xsl:when test="contains(name(), '-before') or contains(name(), '-top')">-top</xsl:when>
+      <xsl:when test="contains(name(), '-after') or contains(name(), '-bottom')">-bottom</xsl:when>
+      <xsl:when test="contains(name(), '-start') or starts-with(name(), 'start-') or contains(name(), '-left')">-left</xsl:when>
+      <xsl:when test="contains(name(), '-end') or starts-with(name(), 'end-') or contains(name(), '-right')">-right</xsl:when>
+    </xsl:choose>
+  </xsl:variable>
+
+  <xsl:variable name="parameter">
+    <xsl:choose>
+      <xsl:when test="contains(name(), '-width')">-width</xsl:when>
+      <xsl:when test="contains(name(), '-color')">-color</xsl:when>
+      <xsl:when test="contains(name(), '-style')">-style</xsl:when>
+    </xsl:choose>
+  </xsl:variable>
+
+  <xsl:value-of select="concat($property, $side, $parameter)"/>
+  <xsl:text>: </xsl:text>
+  <xsl:value-of select="."/>
+  <xsl:text>; </xsl:text>
+</xsl:template>
+
+<xsl:template match="*" mode="check-for-pre" priority="-1">
+  <xsl:apply-templates select="."/>
+</xsl:template>
+
+<xsl:template match="*[@white-space-collapse='false'                     or @linefeed-treatment='preserve'                     or @wrap-option='no-wrap'                     or @white-space='pre']" mode="check-for-pre">
+  <pre><xsl:apply-templates select="."/></pre>
+</xsl:template>
+
+<!-- =============================================================== -->
+<!-- Recalculate a length to pixels. 1 in = 96 px, 1 em = 1 pc;      -->
+<!-- this gives reasonable results for 800x600 and 1024x768 screens  -->
+<!-- =============================================================== -->
+
+<xsl:template match="@*" mode="convert-to-pixels">
+  <xsl:variable name="scaling-factor">
+    <xsl:choose>
+      <xsl:when test="contains (., 'pt')">1.33</xsl:when>
+      <xsl:when test="contains (., 'px')">1</xsl:when>
+      <xsl:when test="contains (., 'pc')">16</xsl:when>
+      <xsl:when test="contains (., 'in')">96</xsl:when>
+      <xsl:when test="contains (., 'cm')">37.8</xsl:when>
+      <xsl:when test="contains (., 'mm')">3.78</xsl:when>
+      <xsl:when test="contains (., 'em')">16</xsl:when> <!-- guess: 1em = 12pt -->
+      <xsl:otherwise>1</xsl:otherwise>
+    </xsl:choose>
+  </xsl:variable>
+
+  <xsl:variable name="numeric-value" select="translate (., '-0123456789.ptxcinme', '-0123456789.')"/>
+  <xsl:value-of select="$numeric-value * $scaling-factor"/>
+</xsl:template>
+
+<!-- =============================================================== -->
+<!-- Remove brackets & quotes around URLs                            -->
+<!-- =============================================================== -->
+
+<xsl:template match="@*" mode="unbracket-url">
+  <xsl:variable name="href" select="normalize-space(.)"/>
+
+  <xsl:choose>
+    <xsl:when test="(starts-with($href, 'url(') or starts-with($href, 'url ('))                      and substring ($href, string-length($href)) = ')'">
+      <!-- Remove 'url' from the beginning -->
+      <xsl:variable name="bracketed" select="normalize-space(substring($href, 4))"/>
+      <!-- Remove brackets -->
+      <xsl:variable name="quoted" select="normalize-space(substring($bracketed, 2, string-length ($bracketed) - 2 ))"/>
+
+      <xsl:variable name="q" select="'&quot;'"/>
+      <xsl:variable name="a" select="&quot;'&quot;"/>
+      <!-- Remove optional quotes -->
+      <xsl:choose>
+        <xsl:when test="( substring($quoted, 1, 1) = $q and                           substring($quoted, string-length($quoted), 1) = $q )                      or ( substring($quoted, 1, 1) = $a and                           substring($quoted, string-length($quoted), 1) = $a )">
+          <xsl:value-of select="substring($quoted, 2, string-length($quoted) - 2)"/>
+        </xsl:when>
+        <xsl:otherwise><xsl:value-of select="$quoted"/></xsl:otherwise>
+      </xsl:choose>
+    </xsl:when>
+    <xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
+
+<!-- =============================================================== -->
+<!-- Page number - replace by a bullet                               -->
+<!-- =============================================================== -->
+
+<xsl:template match="fo:page-number | fo:page-number-citation">
+  <span><xsl:call-template name="add-style-attribute" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"/><xsl:text>&#8226;</xsl:text></span>
+</xsl:template>
+
+<!-- =============================================================== -->
+<!-- Leader - replace by a space                                     -->
+<!-- =============================================================== -->
+
+<xsl:template match="fo:leader">
+  <xsl:text> ��� </xsl:text>
+</xsl:template>
+
+
+
+<!-- =============================================================== -->
+<!-- Static content - add a <hr/> before or after it                 -->
+<!-- =============================================================== -->
+
+<xsl:template match="fo:flow | fo:static-content">
+  <xsl:param name="region"/>
+
+  <div><xsl:call-template name="add-style-attribute" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"/><xsl:apply-templates select="@id" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"/>
+    <xsl:apply-templates select="$region"/>
+    <xsl:apply-templates/>
+    <xsl:if test=".//fo:footnote">
+      <br/><hr/>
+      <xsl:apply-templates select=".//fo:footnote" mode="after-text"/>
+    </xsl:if>
+  </div>
+</xsl:template>
+
+<!-- =============================================================== -->
+<!-- Footnotes                                                       -->
+<!-- =============================================================== -->
+
+<xsl:template match="fo:footnote">
+  <xsl:apply-templates select="fo:inline"/>
+</xsl:template>
+
+<xsl:template match="fo:footnote" mode="after-text">
+  <div><xsl:call-template name="add-style-attribute" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"/><xsl:apply-templates select="@id" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"/>
+    <xsl:apply-templates select="fo:footnote-body"/>
+  </div>
+</xsl:template>
+
+<!-- =============================================================== -->
+<!-- Copy all CSS1-compatible attributes to "style" property         -->
+<!-- =============================================================== -->
+
+<xsl:template name="add-style-attribute">
+  <xsl:param name="orientation" select="0"/>
+  <xsl:variable name="style">
+    <xsl:apply-templates select="@*" mode="collect-style-attributes"/>
+  </xsl:variable>
+
+  <xsl:if test="string-length($style) &gt; 0">
+    <xsl:attribute name="style"><xsl:value-of select="normalize-space($style)"/></xsl:attribute>
+  </xsl:if>
+</xsl:template>
+
+<!-- =============================================================== -->
+<!-- Create an anchor                                                -->
+<!-- =============================================================== -->
+
+<xsl:template match="@id"><a name="{.}"/></xsl:template>
+
+<!-- =============================================================== -->
+<!-- Table cell geometry                                             -->
+<!-- =============================================================== -->
+
+<xsl:template match="@*" mode="get-table-attributes" priority="-1"/>
+
+<xsl:template match="@number-columns-spanned" mode="get-table-attributes">
+  <xsl:attribute name="colspan"><xsl:value-of select="."/></xsl:attribute>
+</xsl:template>
+
+<xsl:template match="@number-rows-spanned" mode="get-table-attributes">
+  <xsl:attribute name="rowspan"><xsl:value-of select="."/></xsl:attribute>
+</xsl:template>
+
+
+
+<!-- =============================================================== -->
+<!-- Page layout: determine master name for the first page           -->
+<!-- =============================================================== -->
+
+<xsl:template match="fo:page-sequence-master">
+  <xsl:apply-templates select="*[1]"/>
+</xsl:template>
+
+<xsl:template match="fo:single-page-master-reference                    | fo:repeatable-page-master-reference">
+  <xsl:value-of select="@master-reference"/>
+</xsl:template>
+
+<xsl:template match="fo:repeatable-page-master-alternatives">
+  <xsl:choose>
+    <xsl:when test="fo:conditional-page-master-reference[@page-position='first']">
+      <xsl:value-of select="fo:conditional-page-master-reference[@page-position='first'][1]/@master-reference"/>
+    </xsl:when>
+    <xsl:when test="fo:conditional-page-master-reference[@odd-or-even='odd' and not (@blank-or-not-blank='blank')]">
+      <xsl:value-of select="fo:conditional-page-master-reference[@odd-or-even='odd' and not (@blank-or-not-blank='blank')][1]/@master-reference"/>
+    </xsl:when>
+    <xsl:when test="fo:conditional-page-master-reference[not(@odd-or-even='even') and not (@blank-or-not-blank='blank')]">
+      <xsl:value-of select="fo:conditional-page-master-reference[not(@odd-or-even='even') and not (@blank-or-not-blank='blank')][1]/@master-reference"/>
+    </xsl:when>
+    <xsl:otherwise> <!-- cannot guess; take the first -->
+      <xsl:value-of select="fo:conditional-page-master-reference[1]/@master-reference"/>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
+
+
+<!-- =============================================================== -->
+<!-- Header/footer properties                                        -->
+<!-- =============================================================== -->
+
+
+<xsl:template match="@extent">
+  <xsl:attribute name="width"><xsl:apply-templates select="." mode="convert-to-pixels"/></xsl:attribute>
+</xsl:template>
+
+<xsl:template match="@width | @height">
+  <xsl:attribute name="{name()}"><xsl:apply-templates select="." mode="convert-to-pixels"/></xsl:attribute>
+</xsl:template>
+
+<xsl:template match="fo:region-before | fo:region-after">
+  <xsl:call-template name="get-area-attributes"/>
+
+  <!-- For header and footer, we suppress margins and padding -->
+  <xsl:variable name="style">
+    <xsl:apply-templates select="@*[not (starts-with (name(), 'margin')                           or starts-with (name(), 'space')                           or starts-with (name(), 'padding'))]" mode="collect-style-attributes">
+      <xsl:with-param name="orientation" select="@reference-orientation"/>
+    </xsl:apply-templates>
+  </xsl:variable>
+
+  <xsl:if test="string-length($style) &gt; 0">
+    <xsl:attribute name="style"><xsl:value-of select="normalize-space($style)"/></xsl:attribute>
+  </xsl:if>
+
+</xsl:template>
+
+<xsl:template match="fo:region-body">
+  <xsl:call-template name="get-area-attributes"/>
+
+  <!-- For region-body, we suppress margin attributes -->
+  <xsl:variable name="style">
+    <xsl:apply-templates select="@*[not (starts-with (name(), 'margin')                           or starts-with (name(), 'space'))]" mode="collect-style-attributes">
+      <xsl:with-param name="orientation" select="@reference-orientation"/>
+    </xsl:apply-templates>
+  </xsl:variable>
+
+  <xsl:if test="string-length($style) &gt; 0">
+    <xsl:attribute name="style"><xsl:value-of select="normalize-space($style)"/></xsl:attribute>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template match="fo:region-start | fo:region-end"/>
+
+<xsl:template name="get-area-attributes">
+  <xsl:attribute name="valign">
+    <xsl:choose>
+      <xsl:when test="@display-align"><xsl:value-of select="@display-align"/></xsl:when>
+      <xsl:otherwise>top</xsl:otherwise>
+    </xsl:choose>
+  </xsl:attribute>
+</xsl:template>
+
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/vmap/vas/rest/conf/cadastreV2/properties.inc b/src/module_cadastreV2/web_service/conf/properties.inc
similarity index 100%
rename from vmap/vas/rest/conf/cadastreV2/properties.inc
rename to src/module_cadastreV2/web_service/conf/properties.inc
diff --git a/vmap/vas/rest/conf/cadastreV2/selected_properties.inc b/src/module_cadastreV2/web_service/conf/selected_properties.inc
similarity index 100%
rename from vmap/vas/rest/conf/cadastreV2/selected_properties.inc
rename to src/module_cadastreV2/web_service/conf/selected_properties.inc
diff --git a/vmap/vas/rest/conf/cadastreV2/version.inc b/src/module_cadastreV2/web_service/conf/version.inc
similarity index 100%
rename from vmap/vas/rest/conf/cadastreV2/version.inc
rename to src/module_cadastreV2/web_service/conf/version.inc
diff --git a/vmap/vas/sql/cadastreV2/sqlQueries.xml b/src/module_cadastreV2/web_service/sql/sqlQueries.xml
similarity index 100%
rename from vmap/vas/sql/cadastreV2/sqlQueries.xml
rename to src/module_cadastreV2/web_service/sql/sqlQueries.xml
diff --git a/vmap/vas/rest/ws/cadastreV2/Adresse.class.inc b/src/module_cadastreV2/web_service/ws/Adresse.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/cadastreV2/Adresse.class.inc
rename to src/module_cadastreV2/web_service/ws/Adresse.class.inc
diff --git a/vmap/vas/rest/ws/cadastreV2/Adresses.class.inc b/src/module_cadastreV2/web_service/ws/Adresses.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/cadastreV2/Adresses.class.inc
rename to src/module_cadastreV2/web_service/ws/Adresses.class.inc
diff --git a/vmap/vas/rest/ws/cadastreV2/CHANGE_LOG.txt b/src/module_cadastreV2/web_service/ws/CHANGE_LOG.txt
similarity index 100%
rename from vmap/vas/rest/ws/cadastreV2/CHANGE_LOG.txt
rename to src/module_cadastreV2/web_service/ws/CHANGE_LOG.txt
diff --git a/vmap/vas/rest/ws/cadastreV2/Cadastre.class.inc b/src/module_cadastreV2/web_service/ws/Cadastre.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/cadastreV2/Cadastre.class.inc
rename to src/module_cadastreV2/web_service/ws/Cadastre.class.inc
diff --git a/vmap/vas/rest/ws/cadastreV2/Commune.class.inc b/src/module_cadastreV2/web_service/ws/Commune.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/cadastreV2/Commune.class.inc
rename to src/module_cadastreV2/web_service/ws/Commune.class.inc
diff --git a/vmap/vas/rest/ws/cadastreV2/CommuneByGeom.class.inc b/src/module_cadastreV2/web_service/ws/CommuneByGeom.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/cadastreV2/CommuneByGeom.class.inc
rename to src/module_cadastreV2/web_service/ws/CommuneByGeom.class.inc
diff --git a/vmap/vas/rest/ws/cadastreV2/Communes.class.inc b/src/module_cadastreV2/web_service/ws/Communes.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/cadastreV2/Communes.class.inc
rename to src/module_cadastreV2/web_service/ws/Communes.class.inc
diff --git a/vmap/vas/rest/ws/cadastreV2/DescriptionParcelle.class.inc b/src/module_cadastreV2/web_service/ws/DescriptionParcelle.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/cadastreV2/DescriptionParcelle.class.inc
rename to src/module_cadastreV2/web_service/ws/DescriptionParcelle.class.inc
diff --git a/vmap/vas/rest/ws/cadastreV2/DescriptionParcelles.class.inc b/src/module_cadastreV2/web_service/ws/DescriptionParcelles.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/cadastreV2/DescriptionParcelles.class.inc
rename to src/module_cadastreV2/web_service/ws/DescriptionParcelles.class.inc
diff --git a/vmap/vas/rest/ws/cadastreV2/DownloadRapport.class.inc b/src/module_cadastreV2/web_service/ws/DownloadRapport.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/cadastreV2/DownloadRapport.class.inc
rename to src/module_cadastreV2/web_service/ws/DownloadRapport.class.inc
diff --git a/vmap/vas/rest/ws/cadastreV2/FicheDescriptiveInvariant.class.inc b/src/module_cadastreV2/web_service/ws/FicheDescriptiveInvariant.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/cadastreV2/FicheDescriptiveInvariant.class.inc
rename to src/module_cadastreV2/web_service/ws/FicheDescriptiveInvariant.class.inc
diff --git a/vmap/vas/rest/ws/cadastreV2/FicheDescriptiveParcelle.class.inc b/src/module_cadastreV2/web_service/ws/FicheDescriptiveParcelle.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/cadastreV2/FicheDescriptiveParcelle.class.inc
rename to src/module_cadastreV2/web_service/ws/FicheDescriptiveParcelle.class.inc
diff --git a/vmap/vas/rest/ws/cadastreV2/FicheUrbanisme.class.inc b/src/module_cadastreV2/web_service/ws/FicheUrbanisme.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/cadastreV2/FicheUrbanisme.class.inc
rename to src/module_cadastreV2/web_service/ws/FicheUrbanisme.class.inc
diff --git a/vmap/vas/rest/ws/cadastreV2/Invariant.class.inc b/src/module_cadastreV2/web_service/ws/Invariant.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/cadastreV2/Invariant.class.inc
rename to src/module_cadastreV2/web_service/ws/Invariant.class.inc
diff --git a/vmap/vas/rest/ws/cadastreV2/Invariants.class.inc b/src/module_cadastreV2/web_service/ws/Invariants.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/cadastreV2/Invariants.class.inc
rename to src/module_cadastreV2/web_service/ws/Invariants.class.inc
diff --git a/vmap/vas/rest/ws/cadastreV2/LieuDit.class.inc b/src/module_cadastreV2/web_service/ws/LieuDit.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/cadastreV2/LieuDit.class.inc
rename to src/module_cadastreV2/web_service/ws/LieuDit.class.inc
diff --git a/vmap/vas/rest/ws/cadastreV2/LieuDitByGeom.class.inc b/src/module_cadastreV2/web_service/ws/LieuDitByGeom.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/cadastreV2/LieuDitByGeom.class.inc
rename to src/module_cadastreV2/web_service/ws/LieuDitByGeom.class.inc
diff --git a/vmap/vas/rest/ws/cadastreV2/LieuDits.class.inc b/src/module_cadastreV2/web_service/ws/LieuDits.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/cadastreV2/LieuDits.class.inc
rename to src/module_cadastreV2/web_service/ws/LieuDits.class.inc
diff --git a/vmap/vas/rest/ws/cadastreV2/Parcelle.class.inc b/src/module_cadastreV2/web_service/ws/Parcelle.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/cadastreV2/Parcelle.class.inc
rename to src/module_cadastreV2/web_service/ws/Parcelle.class.inc
diff --git a/vmap/vas/rest/ws/cadastreV2/ParcelleByGeom.class.inc b/src/module_cadastreV2/web_service/ws/ParcelleByGeom.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/cadastreV2/ParcelleByGeom.class.inc
rename to src/module_cadastreV2/web_service/ws/ParcelleByGeom.class.inc
diff --git a/vmap/vas/rest/ws/cadastreV2/Parcelles.class.inc b/src/module_cadastreV2/web_service/ws/Parcelles.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/cadastreV2/Parcelles.class.inc
rename to src/module_cadastreV2/web_service/ws/Parcelles.class.inc
diff --git a/vmap/vas/rest/ws/cadastreV2/Proprietaire.class.inc b/src/module_cadastreV2/web_service/ws/Proprietaire.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/cadastreV2/Proprietaire.class.inc
rename to src/module_cadastreV2/web_service/ws/Proprietaire.class.inc
diff --git a/vmap/vas/rest/ws/cadastreV2/Proprietaires.class.inc b/src/module_cadastreV2/web_service/ws/Proprietaires.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/cadastreV2/Proprietaires.class.inc
rename to src/module_cadastreV2/web_service/ws/Proprietaires.class.inc
diff --git a/vmap/vas/rest/ws/cadastreV2/RapportsCadastreParcelle.class.inc b/src/module_cadastreV2/web_service/ws/RapportsCadastreParcelle.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/cadastreV2/RapportsCadastreParcelle.class.inc
rename to src/module_cadastreV2/web_service/ws/RapportsCadastreParcelle.class.inc
diff --git a/vmap/vas/rest/ws/cadastreV2/ReleveDePropriete.class.inc b/src/module_cadastreV2/web_service/ws/ReleveDePropriete.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/cadastreV2/ReleveDePropriete.class.inc
rename to src/module_cadastreV2/web_service/ws/ReleveDePropriete.class.inc
diff --git a/vmap/vas/rest/ws/cadastreV2/Section.class.inc b/src/module_cadastreV2/web_service/ws/Section.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/cadastreV2/Section.class.inc
rename to src/module_cadastreV2/web_service/ws/Section.class.inc
diff --git a/vmap/vas/rest/ws/cadastreV2/SectionByGeom.class.inc b/src/module_cadastreV2/web_service/ws/SectionByGeom.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/cadastreV2/SectionByGeom.class.inc
rename to src/module_cadastreV2/web_service/ws/SectionByGeom.class.inc
diff --git a/vmap/vas/rest/ws/cadastreV2/Sections.class.inc b/src/module_cadastreV2/web_service/ws/Sections.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/cadastreV2/Sections.class.inc
rename to src/module_cadastreV2/web_service/ws/Sections.class.inc
diff --git a/vmap/vas/rest/ws/cadastreV2/Versions.class.inc b/src/module_cadastreV2/web_service/ws/Versions.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/cadastreV2/Versions.class.inc
rename to src/module_cadastreV2/web_service/ws/Versions.class.inc
diff --git a/vmap/vas/rest/ws/cadastreV2/Voie.class.inc b/src/module_cadastreV2/web_service/ws/Voie.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/cadastreV2/Voie.class.inc
rename to src/module_cadastreV2/web_service/ws/Voie.class.inc
diff --git a/vmap/vas/rest/ws/cadastreV2/Voies.class.inc b/src/module_cadastreV2/web_service/ws/Voies.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/cadastreV2/Voies.class.inc
rename to src/module_cadastreV2/web_service/ws/Voies.class.inc
diff --git a/vmap/vas/rest/ws/cadastreV2/overview.phtml b/src/module_cadastreV2/web_service/ws/overview.phtml
similarity index 100%
rename from vmap/vas/rest/ws/cadastreV2/overview.phtml
rename to src/module_cadastreV2/web_service/ws/overview.phtml
diff --git a/src/module_vm4ms/README.md b/src/module_vm4ms/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..a4ba10a1e24b9e35c479594a91fcb4997b0d9e61
--- /dev/null
+++ b/src/module_vm4ms/README.md
@@ -0,0 +1 @@
+Module vm4ms for Vitis
\ No newline at end of file
diff --git a/vmap/client/modules/vm4ms/CHANGE_LOG.txt b/src/module_vm4ms/module/CHANGE_LOG.txt
similarity index 100%
rename from vmap/client/modules/vm4ms/CHANGE_LOG.txt
rename to src/module_vm4ms/module/CHANGE_LOG.txt
diff --git a/vmap/client/modules/vm4ms/_install/dependency.xml b/src/module_vm4ms/module/_install/dependency.xml
similarity index 100%
rename from vmap/client/modules/vm4ms/_install/dependency.xml
rename to src/module_vm4ms/module/_install/dependency.xml
diff --git a/vmap/client/modules/vm4ms/forms/configuration/configuration_vitis_configuration_vm4msConfig.json b/src/module_vm4ms/module/forms/configuration/configuration_vitis_configuration_vm4msConfig.json
similarity index 100%
rename from vmap/client/modules/vm4ms/forms/configuration/configuration_vitis_configuration_vm4msConfig.json
rename to src/module_vm4ms/module/forms/configuration/configuration_vitis_configuration_vm4msConfig.json
diff --git a/vmap/client/modules/vm4ms/forms/vm4ms/vm4ms_vm4ms_connection.json b/src/module_vm4ms/module/forms/vm4ms/vm4ms_vm4ms_connection.json
similarity index 100%
rename from vmap/client/modules/vm4ms/forms/vm4ms/vm4ms_vm4ms_connection.json
rename to src/module_vm4ms/module/forms/vm4ms/vm4ms_vm4ms_connection.json
diff --git a/vmap/client/modules/vm4ms/forms/vm4ms/vm4ms_vm4ms_coordsys.json b/src/module_vm4ms/module/forms/vm4ms/vm4ms_vm4ms_coordsys.json
similarity index 100%
rename from vmap/client/modules/vm4ms/forms/vm4ms/vm4ms_vm4ms_coordsys.json
rename to src/module_vm4ms/module/forms/vm4ms/vm4ms_vm4ms_coordsys.json
diff --git a/vmap/client/modules/vm4ms/forms/vm4ms/vm4ms_vm4ms_layer.json b/src/module_vm4ms/module/forms/vm4ms/vm4ms_vm4ms_layer.json
similarity index 100%
rename from vmap/client/modules/vm4ms/forms/vm4ms/vm4ms_vm4ms_layer.json
rename to src/module_vm4ms/module/forms/vm4ms/vm4ms_vm4ms_layer.json
diff --git a/vmap/client/modules/vm4ms/forms/vm4ms/vm4ms_vm4ms_layer_getfeatureinfo_template.json b/src/module_vm4ms/module/forms/vm4ms/vm4ms_vm4ms_layer_getfeatureinfo_template.json
similarity index 100%
rename from vmap/client/modules/vm4ms/forms/vm4ms/vm4ms_vm4ms_layer_getfeatureinfo_template.json
rename to src/module_vm4ms/module/forms/vm4ms/vm4ms_vm4ms_layer_getfeatureinfo_template.json
diff --git a/vmap/client/modules/vm4ms/forms/vm4ms/vm4ms_vm4ms_layer_openlayers_test.json b/src/module_vm4ms/module/forms/vm4ms/vm4ms_vm4ms_layer_openlayers_test.json
similarity index 100%
rename from vmap/client/modules/vm4ms/forms/vm4ms/vm4ms_vm4ms_layer_openlayers_test.json
rename to src/module_vm4ms/module/forms/vm4ms/vm4ms_vm4ms_layer_openlayers_test.json
diff --git a/vmap/client/modules/vm4ms/forms/vm4ms/vm4ms_vm4ms_layer_wms_service.json b/src/module_vm4ms/module/forms/vm4ms/vm4ms_vm4ms_layer_wms_service.json
similarity index 100%
rename from vmap/client/modules/vm4ms/forms/vm4ms/vm4ms_vm4ms_layer_wms_service.json
rename to src/module_vm4ms/module/forms/vm4ms/vm4ms_vm4ms_layer_wms_service.json
diff --git a/vmap/client/modules/vm4ms/forms/vm4ms/vm4ms_vm4ms_metadata.json b/src/module_vm4ms/module/forms/vm4ms/vm4ms_vm4ms_metadata.json
similarity index 100%
rename from vmap/client/modules/vm4ms/forms/vm4ms/vm4ms_vm4ms_metadata.json
rename to src/module_vm4ms/module/forms/vm4ms/vm4ms_vm4ms_metadata.json
diff --git a/vmap/client/modules/vm4ms/forms/vm4ms/vm4ms_vm4ms_private_wms_service.json b/src/module_vm4ms/module/forms/vm4ms/vm4ms_vm4ms_private_wms_service.json
similarity index 100%
rename from vmap/client/modules/vm4ms/forms/vm4ms/vm4ms_vm4ms_private_wms_service.json
rename to src/module_vm4ms/module/forms/vm4ms/vm4ms_vm4ms_private_wms_service.json
diff --git a/vmap/client/modules/vm4ms/forms/vm4ms/vm4ms_vm4ms_private_wms_service_layers.json b/src/module_vm4ms/module/forms/vm4ms/vm4ms_vm4ms_private_wms_service_layers.json
similarity index 100%
rename from vmap/client/modules/vm4ms/forms/vm4ms/vm4ms_vm4ms_private_wms_service_layers.json
rename to src/module_vm4ms/module/forms/vm4ms/vm4ms_vm4ms_private_wms_service_layers.json
diff --git a/vmap/client/modules/vm4ms/forms/vm4ms/vm4ms_vm4ms_private_wms_service_tests.json b/src/module_vm4ms/module/forms/vm4ms/vm4ms_vm4ms_private_wms_service_tests.json
similarity index 100%
rename from vmap/client/modules/vm4ms/forms/vm4ms/vm4ms_vm4ms_private_wms_service_tests.json
rename to src/module_vm4ms/module/forms/vm4ms/vm4ms_vm4ms_private_wms_service_tests.json
diff --git a/vmap/client/modules/vm4ms/forms/vm4ms/vm4ms_vm4ms_public_wms_service.json b/src/module_vm4ms/module/forms/vm4ms/vm4ms_vm4ms_public_wms_service.json
similarity index 100%
rename from vmap/client/modules/vm4ms/forms/vm4ms/vm4ms_vm4ms_public_wms_service.json
rename to src/module_vm4ms/module/forms/vm4ms/vm4ms_vm4ms_public_wms_service.json
diff --git a/vmap/client/modules/vm4ms/forms/vm4ms/vm4ms_vm4ms_public_wms_service_available_layers.json b/src/module_vm4ms/module/forms/vm4ms/vm4ms_vm4ms_public_wms_service_available_layers.json
similarity index 100%
rename from vmap/client/modules/vm4ms/forms/vm4ms/vm4ms_vm4ms_public_wms_service_available_layers.json
rename to src/module_vm4ms/module/forms/vm4ms/vm4ms_vm4ms_public_wms_service_available_layers.json
diff --git a/vmap/client/modules/vm4ms/forms/vm4ms/vm4ms_vm4ms_public_wms_service_layers.json b/src/module_vm4ms/module/forms/vm4ms/vm4ms_vm4ms_public_wms_service_layers.json
similarity index 100%
rename from vmap/client/modules/vm4ms/forms/vm4ms/vm4ms_vm4ms_public_wms_service_layers.json
rename to src/module_vm4ms/module/forms/vm4ms/vm4ms_vm4ms_public_wms_service_layers.json
diff --git a/vmap/client/modules/vm4ms/forms/vm4ms/vm4ms_vm4ms_source.json b/src/module_vm4ms/module/forms/vm4ms/vm4ms_vm4ms_source.json
similarity index 100%
rename from vmap/client/modules/vm4ms/forms/vm4ms/vm4ms_vm4ms_source.json
rename to src/module_vm4ms/module/forms/vm4ms/vm4ms_vm4ms_source.json
diff --git a/vmap/client/modules/vm4ms/forms/vm4ms/vm4ms_vm4ms_web_object.json b/src/module_vm4ms/module/forms/vm4ms/vm4ms_vm4ms_web_object.json
similarity index 100%
rename from vmap/client/modules/vm4ms/forms/vm4ms/vm4ms_vm4ms_web_object.json
rename to src/module_vm4ms/module/forms/vm4ms/vm4ms_vm4ms_web_object.json
diff --git a/vmap/client/modules/vm4ms/forms/vm4ms/vm4ms_vm4ms_web_service_openlayers_test.json b/src/module_vm4ms/module/forms/vm4ms/vm4ms_vm4ms_web_service_openlayers_test.json
similarity index 100%
rename from vmap/client/modules/vm4ms/forms/vm4ms/vm4ms_vm4ms_web_service_openlayers_test.json
rename to src/module_vm4ms/module/forms/vm4ms/vm4ms_vm4ms_web_service_openlayers_test.json
diff --git a/vmap/client/modules/vm4ms/javascript/controllers/layerTestsCtrl.js b/src/module_vm4ms/module/javascript/controllers/layerTestsCtrl.js
similarity index 100%
rename from vmap/client/modules/vm4ms/javascript/controllers/layerTestsCtrl.js
rename to src/module_vm4ms/module/javascript/controllers/layerTestsCtrl.js
diff --git a/vmap/client/modules/vm4ms/javascript/controllers/mapServerSymbolsCtrl.js b/src/module_vm4ms/module/javascript/controllers/mapServerSymbolsCtrl.js
similarity index 100%
rename from vmap/client/modules/vm4ms/javascript/controllers/mapServerSymbolsCtrl.js
rename to src/module_vm4ms/module/javascript/controllers/mapServerSymbolsCtrl.js
diff --git a/vmap/client/modules/vm4ms/javascript/controllers/wmsServiceTestsCtrl.js b/src/module_vm4ms/module/javascript/controllers/wmsServiceTestsCtrl.js
similarity index 100%
rename from vmap/client/modules/vm4ms/javascript/controllers/wmsServiceTestsCtrl.js
rename to src/module_vm4ms/module/javascript/controllers/wmsServiceTestsCtrl.js
diff --git a/vmap/client/modules/vm4ms/javascript/deps.js b/src/module_vm4ms/module/javascript/deps.js
similarity index 100%
rename from vmap/client/modules/vm4ms/javascript/deps.js
rename to src/module_vm4ms/module/javascript/deps.js
diff --git a/vmap/client/modules/vm4ms/javascript/directives/layerTestsDrtv.js b/src/module_vm4ms/module/javascript/directives/layerTestsDrtv.js
similarity index 100%
rename from vmap/client/modules/vm4ms/javascript/directives/layerTestsDrtv.js
rename to src/module_vm4ms/module/javascript/directives/layerTestsDrtv.js
diff --git a/vmap/client/modules/vm4ms/javascript/directives/mapServerSymbolsDrtv.js b/src/module_vm4ms/module/javascript/directives/mapServerSymbolsDrtv.js
similarity index 100%
rename from vmap/client/modules/vm4ms/javascript/directives/mapServerSymbolsDrtv.js
rename to src/module_vm4ms/module/javascript/directives/mapServerSymbolsDrtv.js
diff --git a/vmap/client/modules/vm4ms/javascript/directives/wmsServiceTestsDrtv.js b/src/module_vm4ms/module/javascript/directives/wmsServiceTestsDrtv.js
similarity index 100%
rename from vmap/client/modules/vm4ms/javascript/directives/wmsServiceTestsDrtv.js
rename to src/module_vm4ms/module/javascript/directives/wmsServiceTestsDrtv.js
diff --git a/vmap/client/modules/vm4ms/javascript/script_module.js b/src/module_vm4ms/module/javascript/script_module.js
similarity index 100%
rename from vmap/client/modules/vm4ms/javascript/script_module.js
rename to src/module_vm4ms/module/javascript/script_module.js
diff --git a/vmap/client/modules/vm4ms/lang/lang-en.json b/src/module_vm4ms/module/lang/lang-en.json
similarity index 100%
rename from vmap/client/modules/vm4ms/lang/lang-en.json
rename to src/module_vm4ms/module/lang/lang-en.json
diff --git a/vmap/client/modules/vm4ms/lang/lang-fr.json b/src/module_vm4ms/module/lang/lang-fr.json
similarity index 100%
rename from vmap/client/modules/vm4ms/lang/lang-fr.json
rename to src/module_vm4ms/module/lang/lang-fr.json
diff --git a/vmap/client/modules/vm4ms/less/layer.less b/src/module_vm4ms/module/less/layer.less
similarity index 100%
rename from vmap/client/modules/vm4ms/less/layer.less
rename to src/module_vm4ms/module/less/layer.less
diff --git a/vmap/client/modules/vm4ms/less/layerTests.less b/src/module_vm4ms/module/less/layerTests.less
similarity index 100%
rename from vmap/client/modules/vm4ms/less/layerTests.less
rename to src/module_vm4ms/module/less/layerTests.less
diff --git a/vmap/client/modules/vm4ms/less/main.less b/src/module_vm4ms/module/less/main.less
similarity index 100%
rename from vmap/client/modules/vm4ms/less/main.less
rename to src/module_vm4ms/module/less/main.less
diff --git a/vmap/client/modules/vm4ms/less/mapServerSymbols.less b/src/module_vm4ms/module/less/mapServerSymbols.less
similarity index 100%
rename from vmap/client/modules/vm4ms/less/mapServerSymbols.less
rename to src/module_vm4ms/module/less/mapServerSymbols.less
diff --git a/vmap/client/modules/vm4ms/less/wmsService.less b/src/module_vm4ms/module/less/wmsService.less
similarity index 100%
rename from vmap/client/modules/vm4ms/less/wmsService.less
rename to src/module_vm4ms/module/less/wmsService.less
diff --git a/vmap/client/modules/vm4ms/less/wmsServiceTests.less b/src/module_vm4ms/module/less/wmsServiceTests.less
similarity index 100%
rename from vmap/client/modules/vm4ms/less/wmsServiceTests.less
rename to src/module_vm4ms/module/less/wmsServiceTests.less
diff --git a/vmap/client/modules/vm4ms/template/layerGetFeatureInfoTemplateTpl.html b/src/module_vm4ms/module/template/layerGetFeatureInfoTemplateTpl.html
similarity index 100%
rename from vmap/client/modules/vm4ms/template/layerGetFeatureInfoTemplateTpl.html
rename to src/module_vm4ms/module/template/layerGetFeatureInfoTemplateTpl.html
diff --git a/vmap/client/modules/vm4ms/template/layerTestsTpl.html b/src/module_vm4ms/module/template/layerTestsTpl.html
similarity index 100%
rename from vmap/client/modules/vm4ms/template/layerTestsTpl.html
rename to src/module_vm4ms/module/template/layerTestsTpl.html
diff --git a/vmap/client/modules/vm4ms/template/mapServerFontsTpl.html b/src/module_vm4ms/module/template/mapServerFontsTpl.html
similarity index 100%
rename from vmap/client/modules/vm4ms/template/mapServerFontsTpl.html
rename to src/module_vm4ms/module/template/mapServerFontsTpl.html
diff --git a/vmap/client/modules/vm4ms/template/mapServerSymbolsTpl.html b/src/module_vm4ms/module/template/mapServerSymbolsTpl.html
similarity index 100%
rename from vmap/client/modules/vm4ms/template/mapServerSymbolsTpl.html
rename to src/module_vm4ms/module/template/mapServerSymbolsTpl.html
diff --git a/vmap/client/modules/vm4ms/template/wmsServiceTestsTpl.html b/src/module_vm4ms/module/template/wmsServiceTestsTpl.html
similarity index 100%
rename from vmap/client/modules/vm4ms/template/wmsServiceTestsTpl.html
rename to src/module_vm4ms/module/template/wmsServiceTestsTpl.html
diff --git a/src/module_vm4ms/web_service/CHANGE_LOG.txt b/src/module_vm4ms/web_service/CHANGE_LOG.txt
new file mode 100755
index 0000000000000000000000000000000000000000..98d7e0f16e3048febd786e47e0972cd4166928c0
--- /dev/null
+++ b/src/module_vm4ms/web_service/CHANGE_LOG.txt
@@ -0,0 +1,8 @@
+
+              +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+              +                                                                                   +
+              +             			 VEREMES - vm4ms change log 	            		      +
+              +                                                                                   +
+              +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+b21193|RELEASE	    |vm4ms|	Version 2017.01.00
\ No newline at end of file
diff --git a/src/module_vm4ms/web_service/_install/dependency.xml b/src/module_vm4ms/web_service/_install/dependency.xml
new file mode 100755
index 0000000000000000000000000000000000000000..abacf1516e0f479214087b88519249f18b7308ab
--- /dev/null
+++ b/src/module_vm4ms/web_service/_install/dependency.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- WS vMap -->
+<installer>
+	<schema>
+		<name>s_vm4ms</name>
+		<version>2018.03.00</version>
+		<dependenciesCollection>
+			<dependency>
+				<nature>schema</nature>
+				<name>s_vitis</name>
+				<version>2018.05.00</version>
+				<object>vas</object>
+			</dependency>
+		</dependenciesCollection>
+	</schema>
+	<dependenciesCollection>
+		<dependency>
+			<name>vm4ms-pre-install</name>
+			<nature>extern-pre</nature>
+			<object>vm4ms</object>
+		</dependency>
+		<dependency>
+			<name>vm4ms-post-install</name>
+			<nature>extern-post</nature>
+			<object>vm4ms</object>
+		</dependency>
+		<dependency>
+			<nature>vas</nature>
+			<version>2018.05.00</version>
+		</dependency>
+		<dependency>
+			<nature>web_services</nature>
+			<name>vmap</name>
+			<version>2018.03.00</version>
+		</dependency>
+		<dependency>
+			<name>mapserver</name>
+			<nature>extern-post</nature>
+			<location>mapserver-7.0.7.1</location>
+		</dependency>
+		<!-- Dépendances de mapserver -->
+		<dependency>
+			<name>vcredist-mapserver</name>
+			<nature>extern-pre</nature>
+			<location>vcredist-10-86</location>
+		</dependency>
+		<dependency>
+			<name>vcredist-gdal</name>
+			<nature>extern-pre</nature>
+			<location>vcredist-11</location>
+		</dependency>
+		<!-- Fin des dépendances de mapserver -->
+	</dependenciesCollection>
+</installer>
diff --git a/vmap/vas/rest/conf/vm4ms/properties.inc b/src/module_vm4ms/web_service/conf/properties.inc
similarity index 100%
rename from vmap/vas/rest/conf/vm4ms/properties.inc
rename to src/module_vm4ms/web_service/conf/properties.inc
diff --git a/vmap/vas/rest/conf/vm4ms/properties_post.inc b/src/module_vm4ms/web_service/conf/properties_post.inc
similarity index 100%
rename from vmap/vas/rest/conf/vm4ms/properties_post.inc
rename to src/module_vm4ms/web_service/conf/properties_post.inc
diff --git a/vmap/vas/rest/conf/vm4ms/properties_server.inc b/src/module_vm4ms/web_service/conf/properties_server.inc
similarity index 100%
rename from vmap/vas/rest/conf/vm4ms/properties_server.inc
rename to src/module_vm4ms/web_service/conf/properties_server.inc
diff --git a/vmap/vas/rest/conf/vm4ms/selected_properties.inc b/src/module_vm4ms/web_service/conf/selected_properties.inc
similarity index 100%
rename from vmap/vas/rest/conf/vm4ms/selected_properties.inc
rename to src/module_vm4ms/web_service/conf/selected_properties.inc
diff --git a/vmap/vas/rest/conf/vm4ms/version.inc b/src/module_vm4ms/web_service/conf/version.inc
similarity index 100%
rename from vmap/vas/rest/conf/vm4ms/version.inc
rename to src/module_vm4ms/web_service/conf/version.inc
diff --git a/vmap/vas/sql/vm4ms/sqlQueries.xml b/src/module_vm4ms/web_service/sql/sqlQueries.xml
similarity index 100%
rename from vmap/vas/sql/vm4ms/sqlQueries.xml
rename to src/module_vm4ms/web_service/sql/sqlQueries.xml
diff --git a/vmap/vas/rest/ws/vm4ms/CoordinateSystem.class.inc b/src/module_vm4ms/web_service/ws/CoordinateSystem.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vm4ms/CoordinateSystem.class.inc
rename to src/module_vm4ms/web_service/ws/CoordinateSystem.class.inc
diff --git a/vmap/vas/rest/ws/vm4ms/CoordinateSystems.class.inc b/src/module_vm4ms/web_service/ws/CoordinateSystems.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vm4ms/CoordinateSystems.class.inc
rename to src/module_vm4ms/web_service/ws/CoordinateSystems.class.inc
diff --git a/vmap/vas/rest/ws/vm4ms/Layer.class.inc b/src/module_vm4ms/web_service/ws/Layer.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vm4ms/Layer.class.inc
rename to src/module_vm4ms/web_service/ws/Layer.class.inc
diff --git a/vmap/vas/rest/ws/vm4ms/LayerConnection.class.inc b/src/module_vm4ms/web_service/ws/LayerConnection.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vm4ms/LayerConnection.class.inc
rename to src/module_vm4ms/web_service/ws/LayerConnection.class.inc
diff --git a/vmap/vas/rest/ws/vm4ms/LayerConnections.class.inc b/src/module_vm4ms/web_service/ws/LayerConnections.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vm4ms/LayerConnections.class.inc
rename to src/module_vm4ms/web_service/ws/LayerConnections.class.inc
diff --git a/vmap/vas/rest/ws/vm4ms/LayerType.class.inc b/src/module_vm4ms/web_service/ws/LayerType.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vm4ms/LayerType.class.inc
rename to src/module_vm4ms/web_service/ws/LayerType.class.inc
diff --git a/vmap/vas/rest/ws/vm4ms/LayerTypes.class.inc b/src/module_vm4ms/web_service/ws/LayerTypes.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vm4ms/LayerTypes.class.inc
rename to src/module_vm4ms/web_service/ws/LayerTypes.class.inc
diff --git a/vmap/vas/rest/ws/vm4ms/LayerWmsService.class.inc b/src/module_vm4ms/web_service/ws/LayerWmsService.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vm4ms/LayerWmsService.class.inc
rename to src/module_vm4ms/web_service/ws/LayerWmsService.class.inc
diff --git a/vmap/vas/rest/ws/vm4ms/LayerWmsServices.class.inc b/src/module_vm4ms/web_service/ws/LayerWmsServices.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vm4ms/LayerWmsServices.class.inc
rename to src/module_vm4ms/web_service/ws/LayerWmsServices.class.inc
diff --git a/vmap/vas/rest/ws/vm4ms/Layers.class.inc b/src/module_vm4ms/web_service/ws/Layers.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vm4ms/Layers.class.inc
rename to src/module_vm4ms/web_service/ws/Layers.class.inc
diff --git a/vmap/vas/rest/ws/vm4ms/MapServer.class.inc b/src/module_vm4ms/web_service/ws/MapServer.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vm4ms/MapServer.class.inc
rename to src/module_vm4ms/web_service/ws/MapServer.class.inc
diff --git a/vmap/vas/rest/ws/vm4ms/MapServerDebugLevel.class.inc b/src/module_vm4ms/web_service/ws/MapServerDebugLevel.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vm4ms/MapServerDebugLevel.class.inc
rename to src/module_vm4ms/web_service/ws/MapServerDebugLevel.class.inc
diff --git a/vmap/vas/rest/ws/vm4ms/MapServerDebugLevels.class.inc b/src/module_vm4ms/web_service/ws/MapServerDebugLevels.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vm4ms/MapServerDebugLevels.class.inc
rename to src/module_vm4ms/web_service/ws/MapServerDebugLevels.class.inc
diff --git a/vmap/vas/rest/ws/vm4ms/Metadata.class.inc b/src/module_vm4ms/web_service/ws/Metadata.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vm4ms/Metadata.class.inc
rename to src/module_vm4ms/web_service/ws/Metadata.class.inc
diff --git a/vmap/vas/rest/ws/vm4ms/Metadatas.class.inc b/src/module_vm4ms/web_service/ws/Metadatas.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vm4ms/Metadatas.class.inc
rename to src/module_vm4ms/web_service/ws/Metadatas.class.inc
diff --git a/vmap/vas/rest/ws/vm4ms/PrivateLayer.class.inc b/src/module_vm4ms/web_service/ws/PrivateLayer.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vm4ms/PrivateLayer.class.inc
rename to src/module_vm4ms/web_service/ws/PrivateLayer.class.inc
diff --git a/vmap/vas/rest/ws/vm4ms/PrivateLayers.class.inc b/src/module_vm4ms/web_service/ws/PrivateLayers.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vm4ms/PrivateLayers.class.inc
rename to src/module_vm4ms/web_service/ws/PrivateLayers.class.inc
diff --git a/vmap/vas/rest/ws/vm4ms/PrivateWmsService.class.inc b/src/module_vm4ms/web_service/ws/PrivateWmsService.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vm4ms/PrivateWmsService.class.inc
rename to src/module_vm4ms/web_service/ws/PrivateWmsService.class.inc
diff --git a/vmap/vas/rest/ws/vm4ms/PrivateWmsServiceLayer.class.inc b/src/module_vm4ms/web_service/ws/PrivateWmsServiceLayer.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vm4ms/PrivateWmsServiceLayer.class.inc
rename to src/module_vm4ms/web_service/ws/PrivateWmsServiceLayer.class.inc
diff --git a/vmap/vas/rest/ws/vm4ms/PrivateWmsServiceLayers.class.inc b/src/module_vm4ms/web_service/ws/PrivateWmsServiceLayers.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vm4ms/PrivateWmsServiceLayers.class.inc
rename to src/module_vm4ms/web_service/ws/PrivateWmsServiceLayers.class.inc
diff --git a/vmap/vas/rest/ws/vm4ms/PrivateWmsServices.class.inc b/src/module_vm4ms/web_service/ws/PrivateWmsServices.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vm4ms/PrivateWmsServices.class.inc
rename to src/module_vm4ms/web_service/ws/PrivateWmsServices.class.inc
diff --git a/vmap/vas/rest/ws/vm4ms/PublicLayer.class.inc b/src/module_vm4ms/web_service/ws/PublicLayer.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vm4ms/PublicLayer.class.inc
rename to src/module_vm4ms/web_service/ws/PublicLayer.class.inc
diff --git a/vmap/vas/rest/ws/vm4ms/PublicLayers.class.inc b/src/module_vm4ms/web_service/ws/PublicLayers.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vm4ms/PublicLayers.class.inc
rename to src/module_vm4ms/web_service/ws/PublicLayers.class.inc
diff --git a/vmap/vas/rest/ws/vm4ms/PublicWmsService.class.inc b/src/module_vm4ms/web_service/ws/PublicWmsService.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vm4ms/PublicWmsService.class.inc
rename to src/module_vm4ms/web_service/ws/PublicWmsService.class.inc
diff --git a/vmap/vas/rest/ws/vm4ms/PublicWmsServiceLayer.class.inc b/src/module_vm4ms/web_service/ws/PublicWmsServiceLayer.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vm4ms/PublicWmsServiceLayer.class.inc
rename to src/module_vm4ms/web_service/ws/PublicWmsServiceLayer.class.inc
diff --git a/vmap/vas/rest/ws/vm4ms/PublicWmsServiceLayers.class.inc b/src/module_vm4ms/web_service/ws/PublicWmsServiceLayers.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vm4ms/PublicWmsServiceLayers.class.inc
rename to src/module_vm4ms/web_service/ws/PublicWmsServiceLayers.class.inc
diff --git a/vmap/vas/rest/ws/vm4ms/PublicWmsServices.class.inc b/src/module_vm4ms/web_service/ws/PublicWmsServices.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vm4ms/PublicWmsServices.class.inc
rename to src/module_vm4ms/web_service/ws/PublicWmsServices.class.inc
diff --git a/vmap/vas/rest/ws/vm4ms/Source.class.inc b/src/module_vm4ms/web_service/ws/Source.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vm4ms/Source.class.inc
rename to src/module_vm4ms/web_service/ws/Source.class.inc
diff --git a/vmap/vas/rest/ws/vm4ms/Sources.class.inc b/src/module_vm4ms/web_service/ws/Sources.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vm4ms/Sources.class.inc
rename to src/module_vm4ms/web_service/ws/Sources.class.inc
diff --git a/vmap/vas/rest/ws/vm4ms/Versions.class.inc b/src/module_vm4ms/web_service/ws/Versions.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vm4ms/Versions.class.inc
rename to src/module_vm4ms/web_service/ws/Versions.class.inc
diff --git a/vmap/vas/rest/ws/vm4ms/Vm4msMetadataAccess.class.inc b/src/module_vm4ms/web_service/ws/Vm4msMetadataAccess.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vm4ms/Vm4msMetadataAccess.class.inc
rename to src/module_vm4ms/web_service/ws/Vm4msMetadataAccess.class.inc
diff --git a/vmap/vas/rest/ws/vm4ms/Vm4msMetadataAccess.sql.inc b/src/module_vm4ms/web_service/ws/Vm4msMetadataAccess.sql.inc
similarity index 100%
rename from vmap/vas/rest/ws/vm4ms/Vm4msMetadataAccess.sql.inc
rename to src/module_vm4ms/web_service/ws/Vm4msMetadataAccess.sql.inc
diff --git a/vmap/vas/rest/ws/vm4ms/Vmap4MapServer.class.inc b/src/module_vm4ms/web_service/ws/Vmap4MapServer.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vm4ms/Vmap4MapServer.class.inc
rename to src/module_vm4ms/web_service/ws/Vmap4MapServer.class.inc
diff --git a/vmap/vas/rest/ws/vm4ms/Vmap4MapServer.class.sql.inc b/src/module_vm4ms/web_service/ws/Vmap4MapServer.class.sql.inc
similarity index 100%
rename from vmap/vas/rest/ws/vm4ms/Vmap4MapServer.class.sql.inc
rename to src/module_vm4ms/web_service/ws/Vmap4MapServer.class.sql.inc
diff --git a/vmap/vas/rest/ws/vm4ms/WebObject.class.inc b/src/module_vm4ms/web_service/ws/WebObject.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vm4ms/WebObject.class.inc
rename to src/module_vm4ms/web_service/ws/WebObject.class.inc
diff --git a/vmap/vas/rest/ws/vm4ms/WebObjects.class.inc b/src/module_vm4ms/web_service/ws/WebObjects.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vm4ms/WebObjects.class.inc
rename to src/module_vm4ms/web_service/ws/WebObjects.class.inc
diff --git a/vmap/vas/rest/ws/vm4ms/WmsService.class.inc b/src/module_vm4ms/web_service/ws/WmsService.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vm4ms/WmsService.class.inc
rename to src/module_vm4ms/web_service/ws/WmsService.class.inc
diff --git a/vmap/vas/rest/ws/vm4ms/WmsServiceLayer.class.inc b/src/module_vm4ms/web_service/ws/WmsServiceLayer.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vm4ms/WmsServiceLayer.class.inc
rename to src/module_vm4ms/web_service/ws/WmsServiceLayer.class.inc
diff --git a/vmap/vas/rest/ws/vm4ms/WmsServiceLayers.class.inc b/src/module_vm4ms/web_service/ws/WmsServiceLayers.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vm4ms/WmsServiceLayers.class.inc
rename to src/module_vm4ms/web_service/ws/WmsServiceLayers.class.inc
diff --git a/vmap/vas/rest/ws/vm4ms/WmsServices.class.inc b/src/module_vm4ms/web_service/ws/WmsServices.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vm4ms/WmsServices.class.inc
rename to src/module_vm4ms/web_service/ws/WmsServices.class.inc
diff --git a/vmap/vas/rest/ws/vm4ms/overview.phtml b/src/module_vm4ms/web_service/ws/overview.phtml
similarity index 100%
rename from vmap/vas/rest/ws/vm4ms/overview.phtml
rename to src/module_vm4ms/web_service/ws/overview.phtml
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/antquab.ttf b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/antquab.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..60519c5ad404f8a4edc73f60e7f7f6b71c7a92a6
Binary files /dev/null and b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/antquab.ttf differ
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/antquabi.ttf b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/antquabi.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..59a731cef0a0e6f16a54d4b43127e369755d75bb
Binary files /dev/null and b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/antquabi.ttf differ
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/antquai.ttf b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/antquai.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..cf99b3a9edbe7ea677b909dadd0b7a1b8e47e230
Binary files /dev/null and b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/antquai.ttf differ
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/arial.ttf b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/arial.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..d59f53bf7f64aba232fe3c78636e58c65414dfae
Binary files /dev/null and b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/arial.ttf differ
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/arial.xml b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/arial.xml
new file mode 100755
index 0000000000000000000000000000000000000000..03b2908ff810c6285f4ac7209708a4a93fe8e9e7
--- /dev/null
+++ b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/arial.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><font-metrics metrics-version="2" type="TYPE0"><font-name>Arial</font-name><embed/><cap-height>715</cap-height><x-height>518</x-height><ascender>728</ascender><descender>-210</descender><bbox><left>-664</left><bottom>-324</bottom><right>2028</right><top>1037</top></bbox><flags>32</flags><stemv>0</stemv><italicangle>0</italicangle><subtype>TYPE0</subtype><multibyte-extras><cid-type>CIDFontType2</cid-type><default-width>0</default-width><bfranges><bf gi="3" ue="126" us="32"/><bf gi="3" ue="160" us="160"/><bf gi="163" ue="161" us="161"/><bf gi="132" ue="163" us="162"/><bf gi="862" ue="164" us="164"/><bf gi="150" ue="165" us="165"/><bf gi="230" ue="166" us="166"/><bf gi="134" ue="167" us="167"/><bf gi="142" ue="168" us="168"/><bf gi="139" ue="169" us="169"/><bf gi="157" ue="170" us="170"/><bf gi="169" ue="171" us="171"/><bf gi="164" ue="172" us="172"/><bf gi="16" ue="173" us="173"/><bf gi="138" ue="174" us="174"/><bf gi="256" ue="175" us="175"/><bf gi="131" ue="176" us="176"/><bf gi="147" ue="177" us="177"/><bf gi="240" ue="179" us="178"/><bf gi="141" ue="180" us="180"/><bf gi="151" ue="181" us="181"/><bf gi="136" ue="182" us="182"/><bf gi="194" ue="183" us="183"/><bf gi="220" ue="184" us="184"/><bf gi="239" ue="185" us="185"/><bf gi="158" ue="186" us="186"/><bf gi="170" ue="187" us="187"/><bf gi="243" ue="188" us="188"/><bf gi="242" ue="189" us="189"/><bf gi="244" ue="190" us="190"/><bf gi="162" ue="191" us="191"/><bf gi="172" ue="192" us="192"/><bf gi="200" ue="193" us="193"/><bf gi="198" ue="194" us="194"/><bf gi="173" ue="195" us="195"/><bf gi="98" ue="197" us="196"/><bf gi="144" ue="198" us="198"/><bf gi="100" ue="199" us="199"/><bf gi="202" ue="200" us="200"/><bf gi="101" ue="201" us="201"/><bf gi="199" ue="202" us="202"/><bf gi="201" ue="203" us="203"/><bf gi="206" ue="204" us="204"/><bf gi="203" ue="207" us="205"/><bf gi="231" ue="208" us="208"/><bf gi="102" ue="209" us="209"/><bf gi="209" ue="210" us="210"/><bf gi="207" ue="212" us="211"/><bf gi="174" ue="213" us="213"/><bf gi="103" ue="214" us="214"/><bf gi="238" ue="215" us="215"/><bf gi="145" ue="216" us="216"/><bf gi="212" ue="217" us="217"/><bf gi="210" ue="219" us="218"/><bf gi="104" ue="220" us="220"/><bf gi="233" ue="221" us="221"/><bf gi="235" ue="222" us="222"/><bf gi="137" ue="223" us="223"/><bf gi="106" ue="224" us="224"/><bf gi="105" ue="225" us="225"/><bf gi="107" ue="226" us="226"/><bf gi="109" ue="227" us="227"/><bf gi="108" ue="228" us="228"/><bf gi="110" ue="229" us="229"/><bf gi="160" ue="230" us="230"/><bf gi="111" ue="231" us="231"/><bf gi="113" ue="232" us="232"/><bf gi="112" ue="233" us="233"/><bf gi="114" ue="235" us="234"/><bf gi="117" ue="236" us="236"/><bf gi="116" ue="237" us="237"/><bf gi="118" ue="239" us="238"/><bf gi="232" ue="240" us="240"/><bf gi="120" ue="241" us="241"/><bf gi="122" ue="242" us="242"/><bf gi="121" ue="243" us="243"/><bf gi="123" ue="244" us="244"/><bf gi="125" ue="245" us="245"/><bf gi="124" ue="246" us="246"/><bf gi="183" ue="247" us="247"/><bf gi="161" ue="248" us="248"/><bf gi="127" ue="249" us="249"/><bf gi="126" ue="250" us="250"/><bf gi="128" ue="252" us="251"/><bf gi="234" ue="253" us="253"/><bf gi="236" ue="254" us="254"/><bf gi="185" ue="255" us="255"/><bf gi="406" ue="257" us="256"/><bf gi="258" ue="261" us="258"/><bf gi="251" ue="263" us="262"/><bf gi="408" ue="267" us="264"/><bf gi="253" ue="269" us="268"/><bf gi="262" ue="272" us="270"/><bf gi="255" ue="273" us="273"/><bf gi="412" ue="279" us="274"/><bf gi="265" ue="283" us="280"/><bf gi="418" ue="285" us="284"/><bf gi="246" ue="287" us="286"/><bf gi="420" ue="303" us="288"/><bf gi="248" ue="304" us="304"/><bf gi="213" ue="305" us="305"/><bf gi="394" ue="307" us="306"/><bf gi="436" ue="312" us="308"/><bf gi="269" ue="314" us="313"/><bf gi="441" ue="316" us="315"/><bf gi="271" ue="320" us="317"/><bf gi="224" ue="322" us="321"/><bf gi="275" ue="324" us="323"/><bf gi="443" ue="326" us="325"/><bf gi="277" ue="328" us="327"/><bf gi="396" ue="329" us="329"/><bf gi="445" ue="335" us="330"/><bf gi="279" ue="337" us="336"/><bf gi="175" ue="339" us="338"/><bf gi="281" ue="341" us="340"/><bf gi="451" ue="343" us="342"/><bf gi="283" ue="347" us="344"/><bf gi="453" ue="349" us="348"/><bf gi="249" ue="351" us="350"/><bf gi="226" ue="353" us="352"/><bf gi="287" ue="357" us="354"/><bf gi="455" ue="365" us="358"/><bf gi="291" ue="369" us="366"/><bf gi="463" ue="375" us="370"/><bf gi="186" ue="376" us="376"/><bf gi="295" ue="380" us="377"/><bf gi="228" ue="382" us="381"/><bf gi="469" ue="383" us="383"/><bf gi="166" ue="402" us="402"/><bf gi="1130" ue="417" us="416"/><bf gi="1132" ue="432" us="431"/><bf gi="1276" ue="476" us="461"/><bf gi="470" ue="511" us="506"/><bf gi="214" ue="710" us="710"/><bf gi="223" ue="711" us="711"/><bf gi="216" ue="713" us="713"/><bf gi="217" ue="730" us="728"/><bf gi="222" ue="731" us="731"/><bf gi="215" ue="732" us="732"/><bf gi="221" ue="733" us="733"/><bf gi="1170" ue="769" us="768"/><bf gi="1146" ue="771" us="771"/><bf gi="1140" ue="777" us="777"/><bf gi="1173" ue="803" us="803"/><bf gi="30" ue="894" us="894"/><bf gi="495" ue="902" us="900"/><bf gi="476" ue="903" us="903"/><bf gi="498" ue="906" us="904"/><bf gi="501" ue="908" us="908"/><bf gi="502" ue="914" us="910"/><bf gi="299" ue="915" us="915"/><bf gi="507" ue="919" us="916"/><bf gi="300" ue="920" us="920"/><bf gi="511" ue="929" us="921"/><bf gi="520" ue="933" us="931"/><bf gi="301" ue="934" us="934"/><bf gi="523" ue="944" us="935"/><bf gi="302" ue="945" us="945"/><bf gi="533" ue="947" us="946"/><bf gi="303" ue="949" us="948"/><bf gi="535" ue="959" us="950"/><bf gi="652" ue="960" us="960"/><bf gi="545" ue="962" us="961"/><bf gi="305" ue="964" us="963"/><bf gi="547" ue="965" us="965"/><bf gi="307" ue="966" us="966"/><bf gi="548" ue="974" us="967"/><bf gi="556" ue="1036" us="1025"/><bf gi="568" ue="1103" us="1038"/><bf gi="634" ue="1116" us="1105"/><bf gi="646" ue="1119" us="1118"/><bf gi="648" ue="1169" us="1168"/><bf gi="653" ue="1465" us="1456"/><bf gi="663" ue="1475" us="1467"/><bf gi="672" ue="1514" us="1488"/><bf gi="699" ue="1524" us="1520"/><bf gi="748" ue="1548" us="1548"/><bf gi="749" ue="1563" us="1563"/><bf gi="750" ue="1567" us="1567"/><bf gi="751" ue="1569" us="1569"/><bf gi="897" ue="1570" us="1570"/><bf gi="899" ue="1571" us="1571"/><bf gi="901" ue="1572" us="1572"/><bf gi="903" ue="1573" us="1573"/><bf gi="905" ue="1574" us="1574"/><bf gi="909" ue="1575" us="1575"/><bf gi="911" ue="1576" us="1576"/><bf gi="915" ue="1577" us="1577"/><bf gi="917" ue="1578" us="1578"/><bf gi="921" ue="1579" us="1579"/><bf gi="925" ue="1580" us="1580"/><bf gi="929" ue="1581" us="1581"/><bf gi="933" ue="1582" us="1582"/><bf gi="937" ue="1583" us="1583"/><bf gi="939" ue="1584" us="1584"/><bf gi="941" ue="1585" us="1585"/><bf gi="943" ue="1586" us="1586"/><bf gi="945" ue="1587" us="1587"/><bf gi="949" ue="1588" us="1588"/><bf gi="953" ue="1589" us="1589"/><bf gi="957" ue="1590" us="1590"/><bf gi="961" ue="1591" us="1591"/><bf gi="965" ue="1592" us="1592"/><bf gi="969" ue="1593" us="1593"/><bf gi="973" ue="1594" us="1594"/><bf gi="752" ue="1600" us="1600"/><bf gi="977" ue="1601" us="1601"/><bf gi="981" ue="1602" us="1602"/><bf gi="985" ue="1603" us="1603"/><bf gi="989" ue="1604" us="1604"/><bf gi="993" ue="1605" us="1605"/><bf gi="997" ue="1606" us="1606"/><bf gi="1001" ue="1607" us="1607"/><bf gi="1005" ue="1608" us="1608"/><bf gi="1007" ue="1609" us="1609"/><bf gi="1009" ue="1610" us="1610"/><bf gi="753" ue="1618" us="1611"/><bf gi="761" ue="1643" us="1632"/><bf gi="773" ue="1645" us="1645"/><bf gi="797" ue="1649" us="1649"/><bf gi="799" ue="1662" us="1662"/><bf gi="807" ue="1670" us="1670"/><bf gi="811" ue="1688" us="1688"/><bf gi="803" ue="1700" us="1700"/><bf gi="813" ue="1705" us="1705"/><bf gi="817" ue="1711" us="1711"/><bf gi="821" ue="1740" us="1740"/><bf gi="776" ue="1749" us="1749"/><bf gi="761" ue="1779" us="1776"/><bf gi="778" ue="1782" us="1780"/><bf gi="768" ue="1785" us="1783"/><bf gi="477" ue="7813" us="7808"/><bf gi="1188" ue="7921" us="7840"/><bf gi="483" ue="7923" us="7922"/><bf gi="1270" ue="7929" us="7924"/><bf gi="744" ue="8207" us="8204"/><bf gi="177" ue="8212" us="8211"/><bf gi="650" ue="8213" us="8213"/><bf gi="308" ue="8215" us="8215"/><bf gi="181" ue="8217" us="8216"/><bf gi="195" ue="8218" us="8218"/><bf gi="485" ue="8219" us="8219"/><bf gi="179" ue="8221" us="8220"/><bf gi="196" ue="8222" us="8222"/><bf gi="130" ue="8224" us="8224"/><bf gi="193" ue="8225" us="8225"/><bf gi="135" ue="8226" us="8226"/><bf gi="171" ue="8230" us="8230"/><bf gi="846" ue="8235" us="8234"/><bf gi="850" ue="8236" us="8236"/><bf gi="848" ue="8238" us="8237"/><bf gi="197" ue="8240" us="8240"/><bf gi="397" ue="8243" us="8242"/><bf gi="189" ue="8250" us="8249"/><bf gi="309" ue="8252" us="8252"/><bf gi="486" ue="8254" us="8254"/><bf gi="187" ue="8260" us="8260"/><bf gi="853" ue="8301" us="8298"/><bf gi="851" ue="8303" us="8302"/><bf gi="310" ue="8319" us="8319"/><bf gi="245" ue="8355" us="8355"/><bf gi="487" ue="8356" us="8356"/><bf gi="311" ue="8359" us="8359"/><bf gi="704" ue="8362" us="8362"/><bf gi="1150" ue="8363" us="8363"/><bf gi="188" ue="8364" us="8364"/><bf gi="399" ue="8453" us="8453"/><bf gi="400" ue="8467" us="8467"/><bf gi="651" ue="8470" us="8470"/><bf gi="140" ue="8482" us="8482"/><bf gi="159" ue="8486" us="8486"/><bf gi="488" ue="8494" us="8494"/><bf gi="1151" ue="8532" us="8531"/><bf gi="489" ue="8542" us="8539"/><bf gi="312" ue="8597" us="8592"/><bf gi="318" ue="8616" us="8616"/><bf gi="152" ue="8706" us="8706"/><bf gi="168" ue="8710" us="8710"/><bf gi="154" ue="8719" us="8719"/><bf gi="153" ue="8721" us="8721"/><bf gi="237" ue="8722" us="8722"/><bf gi="187" ue="8725" us="8725"/><bf gi="194" ue="8729" us="8729"/><bf gi="165" ue="8730" us="8730"/><bf gi="146" ue="8734" us="8734"/><bf gi="319" ue="8735" us="8735"/><bf gi="320" ue="8745" us="8745"/><bf gi="156" ue="8747" us="8747"/><bf gi="167" ue="8776" us="8776"/><bf gi="143" ue="8800" us="8800"/><bf gi="321" ue="8801" us="8801"/><bf gi="148" ue="8805" us="8804"/><bf gi="322" ue="8962" us="8962"/><bf gi="323" ue="8976" us="8976"/><bf gi="324" ue="8993" us="8992"/><bf gi="326" ue="9472" us="9472"/><bf gi="327" ue="9474" us="9474"/><bf gi="328" ue="9484" us="9484"/><bf gi="329" ue="9488" us="9488"/><bf gi="330" ue="9492" us="9492"/><bf gi="331" ue="9496" us="9496"/><bf gi="332" ue="9500" us="9500"/><bf gi="333" ue="9508" us="9508"/><bf gi="334" ue="9516" us="9516"/><bf gi="335" ue="9524" us="9524"/><bf gi="336" ue="9532" us="9532"/><bf gi="337" ue="9580" us="9552"/><bf gi="366" ue="9600" us="9600"/><bf gi="367" ue="9604" us="9604"/><bf gi="368" ue="9608" us="9608"/><bf gi="369" ue="9612" us="9612"/><bf gi="370" ue="9619" us="9616"/><bf gi="374" ue="9632" us="9632"/><bf gi="401" ue="9633" us="9633"/><bf gi="402" ue="9643" us="9642"/><bf gi="375" ue="9644" us="9644"/><bf gi="376" ue="9650" us="9650"/><bf gi="377" ue="9658" us="9658"/><bf gi="378" ue="9660" us="9660"/><bf gi="379" ue="9668" us="9668"/><bf gi="184" ue="9674" us="9674"/><bf gi="380" ue="9675" us="9675"/><bf gi="404" ue="9679" us="9679"/><bf gi="381" ue="9689" us="9688"/><bf gi="405" ue="9702" us="9702"/><bf gi="383" ue="9788" us="9786"/><bf gi="386" ue="9792" us="9792"/><bf gi="387" ue="9794" us="9794"/><bf gi="388" ue="9824" us="9824"/><bf gi="389" ue="9827" us="9827"/><bf gi="390" ue="9830" us="9829"/><bf gi="392" ue="9835" us="9834"/><bf gi="705" ue="59397" us="59393"/><bf gi="786" ue="59416" us="59416"/><bf gi="795" ue="59450" us="59450"/><bf gi="191" ue="61442" us="61441"/><bf gi="493" ue="61445" us="61444"/><bf gi="1137" ue="61447" us="61446"/><bf gi="1153" ue="61448" us="61448"/><bf gi="1139" ue="61449" us="61449"/><bf gi="857" ue="61454" us="61450"/><bf gi="1156" ue="61455" us="61455"/><bf gi="1141" ue="61456" us="61456"/><bf gi="1143" ue="61457" us="61457"/><bf gi="1157" ue="61458" us="61458"/><bf gi="1142" ue="61459" us="61459"/><bf gi="1158" ue="61460" us="61460"/><bf gi="1145" ue="61461" us="61461"/><bf gi="1159" ue="61467" us="61462"/><bf gi="1144" ue="61468" us="61468"/><bf gi="1172" ue="61469" us="61469"/><bf gi="1165" ue="61474" us="61470"/><bf gi="1174" ue="61475" us="61475"/><bf gi="1178" ue="61480" us="61476"/><bf gi="1175" ue="61483" us="61481"/><bf gi="1149" ue="61484" us="61484"/><bf gi="1183" ue="61489" us="61485"/><bf gi="191" ue="64258" us="64257"/><bf gi="710" ue="64288" us="64288"/><bf gi="711" ue="64310" us="64298"/><bf gi="724" ue="64316" us="64312"/><bf gi="729" ue="64318" us="64318"/><bf gi="730" ue="64321" us="64320"/><bf gi="732" ue="64324" us="64323"/><bf gi="734" ue="64335" us="64326"/><bf gi="799" ue="64345" us="64342"/><bf gi="807" ue="64381" us="64378"/><bf gi="811" ue="64395" us="64394"/><bf gi="813" ue="64405" us="64398"/><bf gi="821" ue="64509" us="64508"/><bf gi="839" ue="64610" us="64606"/><bf gi="892" ue="64831" us="64830"/><bf gi="895" ue="65010" us="65010"/><bf gi="896" ue="65276" us="65152"/><bf gi="863" ue="65532" us="65532"/><bf gi="0" ue="65535" us="65535"/></bfranges><cid-widths start-index="0"><wx w="750"/><wx w="0"/><wx w="277"/><wx w="277"/><wx w="277"/><wx w="354"/><wx w="556"/><wx w="556"/><wx w="889"/><wx w="666"/><wx w="190"/><wx w="333"/><wx w="333"/><wx w="389"/><wx w="583"/><wx w="277"/><wx w="333"/><wx w="277"/><wx w="277"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="277"/><wx w="277"/><wx w="583"/><wx w="583"/><wx w="583"/><wx w="556"/><wx w="1015"/><wx w="666"/><wx w="666"/><wx w="722"/><wx w="722"/><wx w="666"/><wx w="610"/><wx w="777"/><wx w="722"/><wx w="277"/><wx w="500"/><wx w="666"/><wx w="556"/><wx w="833"/><wx w="722"/><wx w="777"/><wx w="666"/><wx w="777"/><wx w="722"/><wx w="666"/><wx w="610"/><wx w="722"/><wx w="666"/><wx w="943"/><wx w="666"/><wx w="666"/><wx w="610"/><wx w="277"/><wx w="277"/><wx w="277"/><wx w="469"/><wx w="556"/><wx w="333"/><wx w="556"/><wx w="556"/><wx w="500"/><wx w="556"/><wx w="556"/><wx w="277"/><wx w="556"/><wx w="556"/><wx w="222"/><wx w="222"/><wx w="500"/><wx w="222"/><wx w="833"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="333"/><wx w="500"/><wx w="277"/><wx w="556"/><wx w="500"/><wx w="722"/><wx w="500"/><wx w="500"/><wx w="500"/><wx w="333"/><wx w="259"/><wx w="333"/><wx w="583"/><wx w="666"/><wx w="666"/><wx w="722"/><wx w="666"/><wx w="722"/><wx w="777"/><wx w="722"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="500"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="277"/><wx w="277"/><wx w="277"/><wx w="277"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="399"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="350"/><wx w="537"/><wx w="610"/><wx w="736"/><wx w="736"/><wx w="1000"/><wx w="333"/><wx w="333"/><wx w="548"/><wx w="1000"/><wx w="777"/><wx w="712"/><wx w="548"/><wx w="548"/><wx w="548"/><wx w="556"/><wx w="576"/><wx w="494"/><wx w="712"/><wx w="823"/><wx w="548"/><wx w="273"/><wx w="370"/><wx w="365"/><wx w="768"/><wx w="889"/><wx w="610"/><wx w="610"/><wx w="333"/><wx w="583"/><wx w="548"/><wx w="556"/><wx w="548"/><wx w="611"/><wx w="556"/><wx w="556"/><wx w="1000"/><wx w="666"/><wx w="666"/><wx w="777"/><wx w="1000"/><wx w="943"/><wx w="556"/><wx w="1000"/><wx w="333"/><wx w="333"/><wx w="222"/><wx w="222"/><wx w="548"/><wx w="494"/><wx w="500"/><wx w="666"/><wx w="166"/><wx w="556"/><wx w="333"/><wx w="333"/><wx w="500"/><wx w="500"/><wx w="556"/><wx w="277"/><wx w="222"/><wx w="333"/><wx w="1000"/><wx w="666"/><wx w="666"/><wx w="666"/><wx w="666"/><wx w="666"/><wx w="277"/><wx w="277"/><wx w="277"/><wx w="277"/><wx w="777"/><wx w="777"/><wx w="777"/><wx w="722"/><wx w="722"/><wx w="722"/><wx w="277"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="556"/><wx w="222"/><wx w="666"/><wx w="500"/><wx w="610"/><wx w="500"/><wx w="259"/><wx w="722"/><wx w="556"/><wx w="666"/><wx w="500"/><wx w="666"/><wx w="556"/><wx w="583"/><wx w="583"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="833"/><wx w="833"/><wx w="833"/><wx w="556"/><wx w="777"/><wx w="556"/><wx w="277"/><wx w="666"/><wx w="500"/><wx w="722"/><wx w="500"/><wx w="722"/><wx w="500"/><wx w="556"/><wx w="552"/><wx w="333"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="722"/><wx w="614"/><wx w="722"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="556"/><wx w="222"/><wx w="556"/><wx w="291"/><wx w="556"/><wx w="333"/><wx w="722"/><wx w="556"/><wx w="722"/><wx w="556"/><wx w="777"/><wx w="556"/><wx w="722"/><wx w="333"/><wx w="722"/><wx w="333"/><wx w="666"/><wx w="500"/><wx w="610"/><wx w="277"/><wx w="610"/><wx w="375"/><wx w="722"/><wx w="556"/><wx w="722"/><wx w="556"/><wx w="610"/><wx w="500"/><wx w="610"/><wx w="500"/><wx w="550"/><wx w="777"/><wx w="797"/><wx w="578"/><wx w="556"/><wx w="445"/><wx w="617"/><wx w="395"/><wx w="648"/><wx w="552"/><wx w="500"/><wx w="364"/><wx w="1093"/><wx w="1000"/><wx w="500"/><wx w="1000"/><wx w="500"/><wx w="1000"/><wx w="500"/><wx w="500"/><wx w="979"/><wx w="718"/><wx w="583"/><wx w="604"/><wx w="583"/><wx w="604"/><wx w="604"/><wx w="708"/><wx w="625"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="729"/><wx w="604"/><wx w="1000"/><wx w="989"/><wx w="989"/><wx w="989"/><wx w="989"/><wx w="604"/><wx w="604"/><wx w="604"/><wx w="1020"/><wx w="1052"/><wx w="916"/><wx w="750"/><wx w="750"/><wx w="531"/><wx w="656"/><wx w="593"/><wx w="510"/><wx w="500"/><wx w="750"/><wx w="734"/><wx w="443"/><wx w="604"/><wx w="187"/><wx w="354"/><wx w="885"/><wx w="323"/><wx w="604"/><wx w="354"/><wx w="354"/><wx w="604"/><wx w="354"/><wx w="666"/><wx w="556"/><wx w="722"/><wx w="500"/><wx w="722"/><wx w="500"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="777"/><wx w="556"/><wx w="777"/><wx w="556"/><wx w="777"/><wx w="556"/><wx w="722"/><wx w="556"/><wx w="722"/><wx w="556"/><wx w="277"/><wx w="277"/><wx w="277"/><wx w="277"/><wx w="277"/><wx w="277"/><wx w="277"/><wx w="222"/><wx w="500"/><wx w="222"/><wx w="666"/><wx w="500"/><wx w="500"/><wx w="556"/><wx w="222"/><wx w="722"/><wx w="556"/><wx w="723"/><wx w="556"/><wx w="777"/><wx w="556"/><wx w="777"/><wx w="556"/><wx w="722"/><wx w="333"/><wx w="666"/><wx w="500"/><wx w="610"/><wx w="277"/><wx w="722"/><wx w="556"/><wx w="722"/><wx w="556"/><wx w="722"/><wx w="556"/><wx w="722"/><wx w="556"/><wx w="943"/><wx w="722"/><wx w="666"/><wx w="500"/><wx w="222"/><wx w="666"/><wx w="556"/><wx w="1000"/><wx w="889"/><wx w="777"/><wx w="610"/><wx w="277"/><wx w="943"/><wx w="722"/><wx w="943"/><wx w="722"/><wx w="943"/><wx w="722"/><wx w="666"/><wx w="500"/><wx w="222"/><wx w="333"/><wx w="556"/><wx w="600"/><wx w="833"/><wx w="833"/><wx w="833"/><wx w="833"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="667"/><wx w="784"/><wx w="837"/><wx w="383"/><wx w="774"/><wx w="855"/><wx w="752"/><wx w="222"/><wx w="666"/><wx w="666"/><wx w="667"/><wx w="666"/><wx w="610"/><wx w="722"/><wx w="277"/><wx w="666"/><wx w="667"/><wx w="833"/><wx w="722"/><wx w="649"/><wx w="777"/><wx w="722"/><wx w="666"/><wx w="618"/><wx w="610"/><wx w="666"/><wx w="666"/><wx w="835"/><wx w="747"/><wx w="277"/><wx w="666"/><wx w="578"/><wx w="445"/><wx w="556"/><wx w="222"/><wx w="546"/><wx w="575"/><wx w="500"/><wx w="440"/><wx w="556"/><wx w="556"/><wx w="222"/><wx w="500"/><wx w="500"/><wx w="576"/><wx w="500"/><wx w="447"/><wx w="556"/><wx w="568"/><wx w="481"/><wx w="546"/><wx w="524"/><wx w="712"/><wx w="780"/><wx w="222"/><wx w="546"/><wx w="556"/><wx w="546"/><wx w="780"/><wx w="667"/><wx w="864"/><wx w="541"/><wx w="718"/><wx w="666"/><wx w="277"/><wx w="277"/><wx w="500"/><wx w="1057"/><wx w="1010"/><wx w="854"/><wx w="582"/><wx w="635"/><wx w="718"/><wx w="666"/><wx w="656"/><wx w="666"/><wx w="541"/><wx w="677"/><wx w="666"/><wx w="923"/><wx w="604"/><wx w="718"/><wx w="718"/><wx w="582"/><wx w="656"/><wx w="833"/><wx w="722"/><wx w="777"/><wx w="718"/><wx w="666"/><wx w="722"/><wx w="610"/><wx w="635"/><wx w="760"/><wx w="666"/><wx w="739"/><wx w="666"/><wx w="916"/><wx w="937"/><wx w="791"/><wx w="885"/><wx w="656"/><wx w="718"/><wx w="1010"/><wx w="722"/><wx w="556"/><wx w="572"/><wx w="531"/><wx w="364"/><wx w="583"/><wx w="556"/><wx w="668"/><wx w="458"/><wx w="558"/><wx w="558"/><wx w="437"/><wx w="583"/><wx w="687"/><wx w="552"/><wx w="556"/><wx w="541"/><wx w="556"/><wx w="500"/><wx w="458"/><wx w="500"/><wx w="822"/><wx w="500"/><wx w="572"/><wx w="520"/><wx w="802"/><wx w="822"/><wx w="625"/><wx w="718"/><wx w="520"/><wx w="510"/><wx w="750"/><wx w="541"/><wx w="556"/><wx w="556"/><wx w="364"/><wx w="510"/><wx w="500"/><wx w="222"/><wx w="277"/><wx w="222"/><wx w="906"/><wx w="812"/><wx w="556"/><wx w="437"/><wx w="500"/><wx w="552"/><wx w="488"/><wx w="411"/><wx w="1000"/><wx w="1072"/><wx w="689"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="382"/><wx w="333"/><wx w="274"/><wx w="333"/><wx w="333"/><wx w="277"/><wx w="562"/><wx w="541"/><wx w="398"/><wx w="508"/><wx w="602"/><wx w="246"/><wx w="382"/><wx w="598"/><wx w="589"/><wx w="246"/><wx w="509"/><wx w="460"/><wx w="462"/><wx w="598"/><wx w="601"/><wx w="246"/><wx w="352"/><wx w="574"/><wx w="529"/><wx w="566"/><wx w="546"/><wx w="461"/><wx w="478"/><wx w="549"/><wx w="509"/><wx w="694"/><wx w="642"/><wx w="493"/><wx w="493"/><wx w="493"/><wx w="235"/><wx w="416"/><wx w="815"/><wx w="246"/><wx w="509"/><wx w="509"/><wx w="462"/><wx w="462"/><wx w="535"/><wx w="694"/><wx w="694"/><wx w="694"/><wx w="694"/><wx w="562"/><wx w="562"/><wx w="562"/><wx w="541"/><wx w="398"/><wx w="508"/><wx w="602"/><wx w="286"/><wx w="411"/><wx w="589"/><wx w="286"/><wx w="509"/><wx w="460"/><wx w="462"/><wx w="601"/><wx w="352"/><wx w="574"/><wx w="566"/><wx w="546"/><wx w="478"/><wx w="549"/><wx w="509"/><wx w="694"/><wx w="642"/><wx w="246"/><wx w="541"/><wx w="460"/><wx w="546"/><wx w="575"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="318"/><wx w="318"/><wx w="356"/><wx w="412"/><wx w="207"/><wx w="201"/><wx w="236"/><wx w="201"/><wx w="201"/><wx w="209"/><wx w="201"/><wx w="211"/><wx w="164"/><wx w="525"/><wx w="525"/><wx w="525"/><wx w="525"/><wx w="525"/><wx w="525"/><wx w="525"/><wx w="525"/><wx w="525"/><wx w="525"/><wx w="525"/><wx w="318"/><wx w="525"/><wx w="750"/><wx w="750"/><wx w="282"/><wx w="750"/><wx w="525"/><wx w="525"/><wx w="525"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="211"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="638"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="713"/><wx w="713"/><wx w="244"/><wx w="244"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="562"/><wx w="525"/><wx w="529"/><wx w="529"/><wx w="488"/><wx w="488"/><wx w="812"/><wx w="932"/><wx w="394"/><wx w="514"/><wx w="812"/><wx w="932"/><wx w="394"/><wx w="514"/><wx w="638"/><wx w="588"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="226"/><wx w="211"/><wx w="211"/><wx w="211"/><wx w="211"/><wx w="750"/><wx w="750"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="556"/><wx w="1000"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="318"/><wx w="318"/><wx w="750"/><wx w="616"/><wx w="412"/><wx w="207"/><wx w="229"/><wx w="207"/><wx w="229"/><wx w="432"/><wx w="432"/><wx w="207"/><wx w="229"/><wx w="638"/><wx w="588"/><wx w="244"/><wx w="244"/><wx w="207"/><wx w="229"/><wx w="713"/><wx w="713"/><wx w="244"/><wx w="244"/><wx w="282"/><wx w="375"/><wx w="713"/><wx w="713"/><wx w="244"/><wx w="244"/><wx w="713"/><wx w="713"/><wx w="244"/><wx w="244"/><wx w="562"/><wx w="525"/><wx w="529"/><wx w="529"/><wx w="562"/><wx w="525"/><wx w="529"/><wx w="529"/><wx w="562"/><wx w="525"/><wx w="529"/><wx w="529"/><wx w="337"/><wx w="337"/><wx w="337"/><wx w="337"/><wx w="488"/><wx w="488"/><wx w="488"/><wx w="488"/><wx w="821"/><wx w="821"/><wx w="530"/><wx w="530"/><wx w="821"/><wx w="821"/><wx w="530"/><wx w="530"/><wx w="1098"/><wx w="1098"/><wx w="846"/><wx w="846"/><wx w="1098"/><wx w="1098"/><wx w="846"/><wx w="846"/><wx w="581"/><wx w="581"/><wx w="581"/><wx w="581"/><wx w="581"/><wx w="581"/><wx w="581"/><wx w="581"/><wx w="543"/><wx w="450"/><wx w="525"/><wx w="394"/><wx w="543"/><wx w="450"/><wx w="525"/><wx w="394"/><wx w="788"/><wx w="788"/><wx w="267"/><wx w="262"/><wx w="581"/><wx w="581"/><wx w="267"/><wx w="262"/><wx w="601"/><wx w="601"/><wx w="394"/><wx w="394"/><wx w="506"/><wx w="506"/><wx w="207"/><wx w="207"/><wx w="337"/><wx w="337"/><wx w="394"/><wx w="394"/><wx w="525"/><wx w="525"/><wx w="244"/><wx w="244"/><wx w="282"/><wx w="375"/><wx w="450"/><wx w="394"/><wx w="432"/><wx w="432"/><wx w="638"/><wx w="588"/><wx w="638"/><wx w="588"/><wx w="244"/><wx w="244"/><wx w="543"/><wx w="600"/><wx w="543"/><wx w="600"/><wx w="543"/><wx w="600"/><wx w="543"/><wx w="600"/><wx w="750"/><wx w="750"/><wx w="201"/><wx w="201"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="164"/><wx w="211"/><wx w="750"/><wx w="750"/><wx w="209"/><wx w="236"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="211"/><wx w="211"/><wx w="211"/><wx w="211"/><wx w="211"/><wx w="226"/><wx w="750"/><wx w="201"/><wx w="201"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="318"/><wx w="318"/><wx w="318"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="125"/><wx w="1000"/><wx w="2000"/><wx w="857"/><wx w="655"/><wx w="854"/><wx w="669"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="513"/><wx w="833"/><wx w="833"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="222"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="277"/><wx w="222"/><wx w="277"/><wx w="222"/><wx w="777"/><wx w="556"/><wx w="777"/><wx w="556"/><wx w="777"/><wx w="556"/><wx w="777"/><wx w="556"/><wx w="777"/><wx w="556"/><wx w="777"/><wx w="556"/><wx w="777"/><wx w="556"/><wx w="857"/><wx w="655"/><wx w="857"/><wx w="655"/><wx w="857"/><wx w="655"/><wx w="857"/><wx w="655"/><wx w="857"/><wx w="655"/><wx w="722"/><wx w="556"/><wx w="722"/><wx w="556"/><wx w="854"/><wx w="669"/><wx w="854"/><wx w="669"/><wx w="854"/><wx w="669"/><wx w="854"/><wx w="669"/><wx w="854"/><wx w="669"/><wx w="666"/><wx w="500"/><wx w="666"/><wx w="500"/><wx w="666"/><wx w="500"/><wx w="666"/><wx w="556"/><wx w="277"/><wx w="222"/><wx w="777"/><wx w="556"/><wx w="722"/><wx w="556"/><wx w="722"/><wx w="556"/><wx w="722"/><wx w="556"/><wx w="722"/><wx w="556"/><wx w="722"/><wx w="556"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/></cid-widths></multibyte-extras><kerning kpx1="972"><pair kern="-14" kpx2="960"/><pair kern="-19" kpx2="955"/><pair kern="-26" kpx2="967"/><pair kern="-14" kpx2="964"/></kerning><kerning kpx1="1088"><pair kern="-11" kpx2="1103"/><pair kern="-11" kpx2="1093"/><pair kern="-11" kpx2="1079"/><pair kern="-11" kpx2="1091"/><pair kern="-22" kpx2="1076"/><pair kern="-21" kpx2="1095"/><pair kern="-21" kpx2="1090"/><pair kern="-34" kpx2="1083"/></kerning><kerning kpx1="908"><pair kern="-32" kpx2="933"/></kerning><kerning kpx1="960"><pair kern="-14" kpx2="940"/><pair kern="-14" kpx2="950"/><pair kern="-14" kpx2="974"/><pair kern="-14" kpx2="963"/><pair kern="-14" kpx2="966"/><pair kern="-14" kpx2="969"/><pair kern="-14" kpx2="959"/><pair kern="-14" kpx2="945"/><pair kern="-14" kpx2="962"/></kerning><kerning kpx1="927"><pair kern="-18" kpx2="923"/><pair kern="-32" kpx2="933"/><pair kern="-20" kpx2="916"/><pair kern="-32" kpx2="939"/><pair kern="-18" kpx2="913"/></kerning><kerning kpx1="86"><pair kern="-55" kpx2="111"/><pair kern="-37" kpx2="58"/><pair kern="-37" kpx2="114"/><pair kern="-91" kpx2="44"/><pair kern="-18" kpx2="105"/><pair kern="-55" kpx2="173"/><pair kern="-74" kpx2="65"/><pair kern="-74" kpx2="97"/><pair kern="-37" kpx2="894"/><pair kern="-37" kpx2="117"/><pair kern="-37" kpx2="121"/><pair kern="-91" kpx2="46"/><pair kern="-55" kpx2="101"/></kerning><kerning kpx1="958"><pair kern="-26" kpx2="972"/><pair kern="-26" kpx2="940"/><pair kern="-26" kpx2="950"/><pair kern="-26" kpx2="948"/><pair kern="-26" kpx2="963"/><pair kern="-26" kpx2="966"/><pair kern="-26" kpx2="959"/><pair kern="-26" kpx2="945"/><pair kern="-26" kpx2="962"/><pair kern="-26" kpx2="958"/></kerning><kerning kpx1="118"><pair kern="-74" kpx2="46"/><pair kern="-74" kpx2="44"/></kerning><kerning kpx1="1086"><pair kern="-11" kpx2="1093"/><pair kern="-11" kpx2="1079"/><pair kern="-11" kpx2="1091"/><pair kern="-21" kpx2="1076"/><pair kern="-21" kpx2="1095"/><pair kern="-11" kpx2="1078"/><pair kern="-21" kpx2="1090"/><pair kern="-21" kpx2="1083"/></kerning><kerning kpx1="1050"><pair kern="-11" kpx2="1054"/><pair kern="-34" kpx2="1060"/><pair kern="-11" kpx2="1057"/><pair kern="-11" kpx2="1047"/><pair kern="11" kpx2="1059"/></kerning><kerning kpx1="1060"><pair kern="-34" kpx2="1071"/><pair kern="-33" kpx2="1051"/><pair kern="-21" kpx2="1040"/><pair kern="-44" kpx2="1059"/><pair kern="-33" kpx2="1044"/><pair kern="-21" kpx2="1063"/><pair kern="-56" kpx2="1058"/><pair kern="-33" kpx2="1083"/></kerning><kerning kpx1="160"><pair kern="-55" kpx2="923"/><pair kern="-18" kpx2="933"/><pair kern="-55" kpx2="916"/><pair kern="-55" kpx2="65"/><pair kern="-18" kpx2="89"/><pair kern="-18" kpx2="84"/><pair kern="-18" kpx2="939"/><pair kern="-55" kpx2="902"/><pair kern="-18" kpx2="932"/><pair kern="-55" kpx2="913"/></kerning><kerning kpx1="1047"><pair kern="-11" kpx2="1071"/><pair kern="-11" kpx2="1054"/><pair kern="-11" kpx2="1060"/><pair kern="-11" kpx2="1057"/><pair kern="-11" kpx2="1051"/><pair kern="-11" kpx2="1059"/><pair kern="-21" kpx2="1063"/><pair kern="-21" kpx2="1058"/></kerning><kerning kpx1="1057"><pair kern="-11" kpx2="1069"/><pair kern="-11" kpx2="1052"/><pair kern="-21" kpx2="1044"/><pair kern="-34" kpx2="1066"/><pair kern="-56" kpx2="1061"/><pair kern="-33" kpx2="1058"/><pair kern="-21" kpx2="1054"/><pair kern="-11" kpx2="1047"/><pair kern="11" kpx2="1072"/><pair kern="-21" kpx2="1040"/><pair kern="-33" kpx2="1051"/><pair kern="-33" kpx2="1059"/><pair kern="-11" kpx2="1095"/><pair kern="21" kpx2="1078"/><pair kern="-33" kpx2="1063"/></kerning><kerning kpx1="937"><pair kern="-22" kpx2="933"/><pair kern="-22" kpx2="939"/></kerning><kerning kpx1="913"><pair kern="-18" kpx2="967"/><pair kern="-74" kpx2="933"/><pair kern="-18" kpx2="957"/><pair kern="-55" kpx2="160"/><pair kern="-20" kpx2="920"/><pair kern="-74" kpx2="939"/><pair kern="-20" kpx2="927"/><pair kern="-28" kpx2="934"/><pair kern="-74" kpx2="932"/><pair kern="-18" kpx2="947"/><pair kern="-74" kpx2="8217"/></kerning><kerning kpx1="82"><pair kern="-18" kpx2="87"/><pair kern="-18" kpx2="89"/><pair kern="-18" kpx2="84"/><pair kern="-18" kpx2="86"/></kerning><kerning kpx1="119"><pair kern="-55" kpx2="46"/><pair kern="-55" kpx2="44"/></kerning><kerning kpx1="1045"><pair kern="-11" kpx2="1089"/><pair kern="-21" kpx2="1047"/></kerning><kerning kpx1="1101"><pair kern="-11" kpx2="1103"/><pair kern="-11" kpx2="1093"/><pair kern="11" kpx2="1086"/><pair kern="11" kpx2="1077"/><pair kern="-11" kpx2="1079"/><pair kern="-21" kpx2="1076"/><pair kern="-21" kpx2="1090"/><pair kern="-21" kpx2="1083"/></kerning><kerning kpx1="1084"><pair kern="-11" kpx2="1079"/><pair kern="11" kpx2="1091"/><pair kern="-11" kpx2="1073"/></kerning><kerning kpx1="1052"><pair kern="11" kpx2="1086"/><pair kern="-11" kpx2="1060"/><pair kern="11" kpx2="1089"/><pair kern="11" kpx2="1077"/><pair kern="11" kpx2="1101"/><pair kern="11" kpx2="1091"/><pair kern="11" kpx2="1072"/><pair kern="-11" kpx2="1095"/><pair kern="-11" kpx2="1063"/></kerning><kerning kpx1="939"><pair kern="-90" kpx2="972"/><pair kern="-74" kpx2="923"/><pair kern="-90" kpx2="963"/><pair kern="-74" kpx2="951"/><pair kern="-74" kpx2="954"/><pair kern="-56" kpx2="927"/><pair kern="-90" kpx2="959"/><pair kern="83" kpx2="912"/><pair kern="-37" kpx2="943"/><pair kern="-37" kpx2="953"/><pair kern="47" kpx2="970"/><pair kern="-74" kpx2="916"/><pair kern="-18" kpx2="160"/><pair kern="-56" kpx2="920"/><pair kern="-74" kpx2="942"/><pair kern="-74" kpx2="956"/><pair kern="-90" kpx2="966"/><pair kern="-47" kpx2="937"/><pair kern="-56" kpx2="934"/><pair kern="-90" kpx2="945"/><pair kern="-74" kpx2="913"/></kerning><kerning kpx1="959"><pair kern="-14" kpx2="960"/><pair kern="-19" kpx2="955"/><pair kern="-26" kpx2="967"/><pair kern="-14" kpx2="964"/></kerning><kerning kpx1="915"><pair kern="-91" kpx2="923"/><pair kern="-42" kpx2="953"/><pair kern="42" kpx2="970"/><pair kern="-91" kpx2="916"/><pair kern="-109" kpx2="46"/><pair kern="80" kpx2="912"/><pair kern="-91" kpx2="913"/><pair kern="-109" kpx2="44"/></kerning><kerning kpx1="1058"><pair kern="-56" kpx2="1088"/><pair kern="-43" kpx2="1097"/><pair kern="-56" kpx2="1077"/><pair kern="-43" kpx2="171"/><pair kern="-43" kpx2="1080"/><pair kern="-43" kpx2="187"/><pair kern="-21" kpx2="8212"/><pair kern="-78" kpx2="1086"/><pair kern="-43" kpx2="1099"/><pair kern="-33" kpx2="1060"/><pair kern="-56" kpx2="1089"/><pair kern="-56" kpx2="1091"/><pair kern="-11" kpx2="1047"/><pair kern="-33" kpx2="1040"/><pair kern="-43" kpx2="1087"/><pair kern="-43" kpx2="1093"/><pair kern="-43" kpx2="1084"/><pair kern="-43" kpx2="1102"/><pair kern="-33" kpx2="1044"/><pair kern="-110" kpx2="44"/><pair kern="-56" kpx2="1103"/><pair kern="-21" kpx2="1071"/><pair kern="-44" kpx2="1054"/><pair kern="-43" kpx2="1082"/><pair kern="-43" kpx2="1074"/><pair kern="-44" kpx2="1072"/><pair kern="-21" kpx2="1051"/><pair kern="-43" kpx2="1100"/><pair kern="-110" kpx2="46"/><pair kern="11" kpx2="1046"/><pair kern="-44" kpx2="1083"/></kerning><kerning kpx1="920"><pair kern="-18" kpx2="923"/><pair kern="-32" kpx2="933"/><pair kern="-18" kpx2="916"/><pair kern="-32" kpx2="939"/><pair kern="-18" kpx2="913"/></kerning><kerning kpx1="121"><pair kern="-74" kpx2="46"/><pair kern="-74" kpx2="44"/></kerning><kerning kpx1="1051"><pair kern="-11" kpx2="1060"/><pair kern="11" kpx2="1091"/><pair kern="11" kpx2="1073"/></kerning><kerning kpx1="1046"><pair kern="-11" kpx2="1086"/><pair kern="-21" kpx2="1054"/><pair kern="-12" kpx2="1077"/><pair kern="-11" kpx2="1091"/><pair kern="-11" kpx2="1057"/><pair kern="-11" kpx2="1047"/><pair kern="11" kpx2="1072"/><pair kern="21" kpx2="1066"/><pair kern="21" kpx2="1059"/><pair kern="11" kpx2="1058"/></kerning><kerning kpx1="1041"><pair kern="-11" kpx2="1069"/><pair kern="-33" kpx2="1066"/><pair kern="-21" kpx2="1061"/><pair kern="-44" kpx2="1058"/><pair kern="-11" kpx2="1054"/><pair kern="-11" kpx2="1071"/><pair kern="-11" kpx2="1060"/><pair kern="-21" kpx2="1091"/><pair kern="-11" kpx2="1047"/><pair kern="-11" kpx2="1057"/><pair kern="-21" kpx2="1040"/><pair kern="-22" kpx2="1059"/><pair kern="-44" kpx2="1063"/><pair kern="-11" kpx2="1083"/></kerning><kerning kpx1="1083"><pair kern="11" kpx2="1086"/><pair kern="-21" kpx2="1095"/></kerning><kerning kpx1="1097"><pair kern="-11" kpx2="1086"/><pair kern="-11" kpx2="1077"/><pair kern="11" kpx2="1091"/></kerning><kerning kpx1="950"><pair kern="-66" kpx2="972"/><pair kern="-66" kpx2="940"/><pair kern="-41" kpx2="960"/><pair kern="-66" kpx2="963"/><pair kern="-18" kpx2="951"/><pair kern="-18" kpx2="954"/><pair kern="-66" kpx2="959"/><pair kern="-41" kpx2="964"/><pair kern="-41" kpx2="947"/><pair kern="-18" kpx2="953"/><pair kern="-37" kpx2="948"/><pair kern="-66" kpx2="974"/><pair kern="-47" kpx2="952"/><pair kern="-41" kpx2="957"/><pair kern="-18" kpx2="942"/><pair kern="-66" kpx2="966"/><pair kern="-66" kpx2="969"/><pair kern="-66" kpx2="945"/></kerning><kerning kpx1="929"><pair kern="-74" kpx2="923"/><pair kern="-74" kpx2="916"/><pair kern="-18" kpx2="160"/><pair kern="-127" kpx2="46"/><pair kern="-74" kpx2="913"/><pair kern="-127" kpx2="44"/></kerning><kerning kpx1="87"><pair kern="-18" kpx2="111"/><pair kern="-18" kpx2="173"/><pair kern="-18" kpx2="58"/><pair kern="-18" kpx2="114"/><pair kern="-37" kpx2="97"/><pair kern="-37" kpx2="65"/><pair kern="-18" kpx2="894"/><pair kern="-18" kpx2="117"/><pair kern="-8" kpx2="121"/><pair kern="-55" kpx2="46"/><pair kern="-18" kpx2="101"/><pair kern="-55" kpx2="44"/></kerning><kerning kpx1="932"><pair kern="-109" kpx2="972"/><pair kern="-109" kpx2="940"/><pair kern="-109" kpx2="963"/><pair kern="-86" kpx2="971"/><pair kern="-18" kpx2="927"/><pair kern="-86" kpx2="947"/><pair kern="-37" kpx2="953"/><pair kern="-74" kpx2="916"/><pair kern="-18" kpx2="160"/><pair kern="-109" kpx2="966"/><pair kern="-18" kpx2="937"/><pair kern="-74" kpx2="913"/><pair kern="-109" kpx2="945"/><pair kern="-74" kpx2="923"/><pair kern="-55" kpx2="967"/><pair kern="-109" kpx2="58"/><pair kern="-73" kpx2="951"/><pair kern="-73" kpx2="968"/><pair kern="-86" kpx2="944"/><pair kern="-109" kpx2="959"/><pair kern="91" kpx2="912"/><pair kern="-109" kpx2="44"/><pair kern="-85" kpx2="965"/><pair kern="91" kpx2="970"/><pair kern="-109" kpx2="894"/><pair kern="-55" kpx2="957"/><pair kern="-18" kpx2="920"/><pair kern="-73" kpx2="956"/><pair kern="-109" kpx2="46"/><pair kern="-109" kpx2="949"/><pair kern="-18" kpx2="934"/><pair kern="-86" kpx2="973"/><pair kern="-109" kpx2="941"/></kerning><kerning kpx1="964"><pair kern="-14" kpx2="940"/><pair kern="-14" kpx2="950"/><pair kern="-14" kpx2="948"/><pair kern="-14" kpx2="974"/><pair kern="-14" kpx2="963"/><pair kern="-14" kpx2="966"/><pair kern="-14" kpx2="969"/><pair kern="-14" kpx2="959"/><pair kern="-14" kpx2="945"/><pair kern="-14" kpx2="962"/></kerning><kerning kpx1="1061"><pair kern="-34" kpx2="1069"/><pair kern="-11" kpx2="1086"/><pair kern="-33" kpx2="1054"/><pair kern="-33" kpx2="1060"/><pair kern="-21" kpx2="1091"/><pair kern="-33" kpx2="1057"/><pair kern="-21" kpx2="1047"/></kerning><kerning kpx1="65"><pair kern="-18" kpx2="119"/><pair kern="-37" kpx2="87"/><pair kern="-55" kpx2="160"/><pair kern="-74" kpx2="89"/><pair kern="-18" kpx2="121"/><pair kern="-74" kpx2="84"/><pair kern="-74" kpx2="86"/><pair kern="-74" kpx2="8217"/><pair kern="-18" kpx2="118"/></kerning><kerning kpx1="974"><pair kern="-14" kpx2="960"/><pair kern="-19" kpx2="955"/><pair kern="-26" kpx2="967"/><pair kern="-14" kpx2="964"/></kerning><kerning kpx1="1027"><pair kern="-66" kpx2="171"/><pair kern="-122" kpx2="46"/><pair kern="-66" kpx2="187"/><pair kern="-21" kpx2="8212"/><pair kern="-122" kpx2="44"/></kerning><kerning kpx1="1079"><pair kern="-11" kpx2="1086"/><pair kern="-11" kpx2="1089"/><pair kern="-11" kpx2="1077"/><pair kern="-11" kpx2="1079"/><pair kern="-11" kpx2="1091"/><pair kern="-21" kpx2="1098"/><pair kern="-21" kpx2="1076"/><pair kern="-33" kpx2="1095"/><pair kern="-11" kpx2="1092"/><pair kern="-11" kpx2="1073"/><pair kern="-11" kpx2="1083"/></kerning><kerning kpx1="1091"><pair kern="-11" kpx2="1088"/><pair kern="-11" kpx2="1077"/><pair kern="-11" kpx2="1101"/><pair kern="-11" kpx2="1084"/><pair kern="-33" kpx2="1076"/><pair kern="11" kpx2="187"/><pair kern="-11" kpx2="1092"/><pair kern="-100" kpx2="44"/><pair kern="-11" kpx2="1103"/><pair kern="-12" kpx2="1086"/><pair kern="-11" kpx2="1089"/><pair kern="-11" kpx2="1072"/><pair kern="-100" kpx2="46"/><pair kern="11" kpx2="1078"/><pair kern="11" kpx2="1073"/><pair kern="-21" kpx2="1083"/></kerning><kerning kpx1="1040"><pair kern="-21" kpx2="1069"/><pair kern="21" kpx2="1101"/><pair kern="33" kpx2="1044"/><pair kern="11" kpx2="1092"/><pair kern="-21" kpx2="1090"/><pair kern="-78" kpx2="1058"/><pair kern="-56" kpx2="8217"/><pair kern="-21" kpx2="1054"/><pair kern="-33" kpx2="1060"/><pair kern="-11" kpx2="1091"/><pair kern="-11" kpx2="1047"/><pair kern="-21" kpx2="1057"/><pair kern="11" kpx2="1072"/><pair kern="21" kpx2="1051"/><pair kern="-11" kpx2="1055"/><pair kern="-43" kpx2="1059"/><pair kern="-78" kpx2="1063"/></kerning><kerning kpx1="969"><pair kern="-14" kpx2="960"/><pair kern="-19" kpx2="955"/><pair kern="-26" kpx2="967"/><pair kern="-14" kpx2="964"/></kerning><kerning kpx1="1059"><pair kern="-44" kpx2="1088"/><pair kern="-21" kpx2="1069"/><pair kern="-44" kpx2="1097"/><pair kern="-66" kpx2="1077"/><pair kern="-43" kpx2="171"/><pair kern="-44" kpx2="1085"/><pair kern="-44" kpx2="1080"/><pair kern="-44" kpx2="187"/><pair kern="-11" kpx2="8212"/><pair kern="-66" kpx2="1086"/><pair kern="-33" kpx2="1060"/><pair kern="-44" kpx2="1096"/><pair kern="-66" kpx2="1089"/><pair kern="-56" kpx2="1079"/><pair kern="-21" kpx2="1047"/><pair kern="-66" kpx2="1040"/><pair kern="-44" kpx2="1087"/><pair kern="-33" kpx2="1078"/><pair kern="-44" kpx2="1093"/><pair kern="-21" kpx2="58"/><pair kern="-44" kpx2="1084"/><pair kern="-44" kpx2="1094"/><pair kern="-78" kpx2="1076"/><pair kern="-33" kpx2="1081"/><pair kern="-44" kpx2="1102"/><pair kern="-44" kpx2="1044"/><pair kern="-132" kpx2="44"/><pair kern="-66" kpx2="1103"/><pair kern="-33" kpx2="1054"/><pair kern="-21" kpx2="1071"/><pair kern="-44" kpx2="1075"/><pair kern="-44" kpx2="1082"/><pair kern="-21" kpx2="894"/><pair kern="-56" kpx2="1074"/><pair kern="-33" kpx2="1051"/><pair kern="-132" kpx2="46"/><pair kern="-21" kpx2="1073"/><pair kern="-66" kpx2="1083"/></kerning><kerning kpx1="923"><pair kern="-74" kpx2="933"/><pair kern="-55" kpx2="160"/><pair kern="-20" kpx2="920"/><pair kern="-74" kpx2="939"/><pair kern="-20" kpx2="927"/><pair kern="-74" kpx2="932"/></kerning><kerning kpx1="967"><pair kern="-26" kpx2="972"/><pair kern="-26" kpx2="940"/><pair kern="-26" kpx2="950"/><pair kern="-26" kpx2="948"/><pair kern="-26" kpx2="974"/><pair kern="-26" kpx2="963"/><pair kern="-26" kpx2="966"/><pair kern="-26" kpx2="969"/><pair kern="-26" kpx2="959"/><pair kern="-26" kpx2="945"/><pair kern="-26" kpx2="962"/></kerning><kerning kpx1="961"><pair kern="-14" kpx2="960"/><pair kern="-19" kpx2="955"/><pair kern="-14" kpx2="964"/></kerning><kerning kpx1="114"><pair kern="-55" kpx2="46"/><pair kern="37" kpx2="8217"/><pair kern="-55" kpx2="44"/></kerning><kerning kpx1="1062"><pair kern="-21" kpx2="1054"/><pair kern="21" kpx2="1072"/></kerning><kerning kpx1="931"><pair kern="-47" kpx2="960"/><pair kern="-47" kpx2="964"/></kerning><kerning kpx1="954"><pair kern="-12" kpx2="940"/><pair kern="-12" kpx2="972"/><pair kern="-12" kpx2="950"/><pair kern="-12" kpx2="963"/><pair kern="-12" kpx2="959"/><pair kern="-12" kpx2="958"/><pair kern="-12" kpx2="948"/><pair kern="-12" kpx2="974"/><pair kern="-12" kpx2="952"/><pair kern="-12" kpx2="966"/><pair kern="-12" kpx2="969"/><pair kern="-12" kpx2="945"/><pair kern="-12" kpx2="962"/></kerning><kerning kpx1="922"><pair kern="-12" kpx2="972"/><pair kern="-12" kpx2="940"/><pair kern="-12" kpx2="950"/><pair kern="-12" kpx2="963"/><pair kern="-30" kpx2="927"/><pair kern="-12" kpx2="959"/><pair kern="-12" kpx2="958"/><pair kern="-12" kpx2="948"/><pair kern="-12" kpx2="974"/><pair kern="-12" kpx2="952"/><pair kern="-30" kpx2="920"/><pair kern="-12" kpx2="966"/><pair kern="-12" kpx2="969"/><pair kern="-55" kpx2="934"/><pair kern="-12" kpx2="945"/></kerning><kerning kpx1="76"><pair kern="-74" kpx2="87"/><pair kern="-37" kpx2="160"/><pair kern="-74" kpx2="89"/><pair kern="-37" kpx2="121"/><pair kern="-74" kpx2="84"/><pair kern="-74" kpx2="86"/><pair kern="-55" kpx2="8217"/></kerning><kerning kpx1="936"><pair kern="-38" kpx2="972"/><pair kern="-38" kpx2="940"/><pair kern="-38" kpx2="948"/><pair kern="-38" kpx2="974"/><pair kern="-38" kpx2="963"/><pair kern="-19" kpx2="952"/><pair kern="-38" kpx2="966"/><pair kern="-38" kpx2="969"/><pair kern="-38" kpx2="959"/><pair kern="-38" kpx2="945"/></kerning><kerning kpx1="1090"><pair kern="-11" kpx2="1086"/><pair kern="-11" kpx2="1089"/><pair kern="-11" kpx2="1077"/><pair kern="11" kpx2="1091"/><pair kern="-11" kpx2="1072"/><pair kern="-33" kpx2="1076"/><pair kern="-110" kpx2="46"/><pair kern="33" kpx2="1078"/><pair kern="-21" kpx2="1083"/><pair kern="-110" kpx2="44"/></kerning><kerning kpx1="1082"><pair kern="11" kpx2="1086"/><pair kern="11" kpx2="1089"/><pair kern="11" kpx2="1077"/><pair kern="11" kpx2="1101"/><pair kern="11" kpx2="1079"/><pair kern="11" kpx2="1091"/><pair kern="21" kpx2="1072"/><pair kern="11" kpx2="1090"/><pair kern="21" kpx2="1073"/><pair kern="11" kpx2="1083"/></kerning><kerning kpx1="1118"><pair kern="-100" kpx2="46"/><pair kern="-100" kpx2="44"/></kerning><kerning kpx1="1072"><pair kern="-11" kpx2="1079"/><pair kern="-11" kpx2="1091"/><pair kern="-21" kpx2="1095"/><pair kern="-21" kpx2="1090"/></kerning><kerning kpx1="1100"><pair kern="-66" kpx2="1095"/><pair kern="-78" kpx2="1090"/></kerning><kerning kpx1="1069"><pair kern="-11" kpx2="1103"/><pair kern="-21" kpx2="1071"/><pair kern="-11" kpx2="1084"/><pair kern="-11" kpx2="1047"/><pair kern="-33" kpx2="1051"/><pair kern="-33" kpx2="1076"/><pair kern="-33" kpx2="1044"/><pair kern="-34" kpx2="1061"/><pair kern="-12" kpx2="1046"/><pair kern="11" kpx2="1078"/><pair kern="-33" kpx2="1083"/></kerning><kerning kpx1="955"><pair kern="-15" kpx2="940"/><pair kern="-15" kpx2="972"/><pair kern="-15" kpx2="963"/><pair kern="-15" kpx2="959"/><pair kern="-15" kpx2="958"/><pair kern="-23" kpx2="965"/><pair kern="-15" kpx2="948"/><pair kern="-15" kpx2="974"/><pair kern="-18" kpx2="966"/><pair kern="-15" kpx2="969"/><pair kern="-23" kpx2="973"/><pair kern="-15" kpx2="945"/><pair kern="-22" kpx2="962"/></kerning><kerning kpx1="1033"><pair kern="-78" kpx2="8217"/></kerning><kerning kpx1="1034"><pair kern="-66" kpx2="8217"/></kerning><kerning kpx1="80"><pair kern="-74" kpx2="65"/><pair kern="-18" kpx2="160"/><pair kern="-128" kpx2="46"/><pair kern="-128" kpx2="44"/></kerning><kerning kpx1="8222"><pair kern="-78" kpx2="1035"/><pair kern="-78" kpx2="1026"/><pair kern="-33" kpx2="1066"/><pair kern="-33" kpx2="1063"/><pair kern="-78" kpx2="1058"/></kerning><kerning kpx1="1089"><pair kern="11" kpx2="1086"/><pair kern="11" kpx2="1101"/><pair kern="-11" kpx2="1095"/><pair kern="11" kpx2="1078"/></kerning><kerning kpx1="910"><pair kern="-90" kpx2="972"/><pair kern="-74" kpx2="923"/><pair kern="-90" kpx2="963"/><pair kern="-74" kpx2="951"/><pair kern="-74" kpx2="954"/><pair kern="-56" kpx2="927"/><pair kern="-90" kpx2="959"/><pair kern="83" kpx2="912"/><pair kern="-37" kpx2="943"/><pair kern="-37" kpx2="953"/><pair kern="47" kpx2="970"/><pair kern="-74" kpx2="916"/><pair kern="-56" kpx2="920"/><pair kern="-74" kpx2="942"/><pair kern="-74" kpx2="956"/><pair kern="-90" kpx2="966"/><pair kern="-47" kpx2="937"/><pair kern="-56" kpx2="934"/><pair kern="-90" kpx2="945"/><pair kern="-74" kpx2="913"/></kerning><kerning kpx1="70"><pair kern="-55" kpx2="65"/><pair kern="-110" kpx2="46"/><pair kern="-110" kpx2="44"/></kerning><kerning kpx1="966"><pair kern="-14" kpx2="960"/><pair kern="-19" kpx2="955"/><pair kern="-26" kpx2="967"/><pair kern="-14" kpx2="964"/></kerning><kerning kpx1="1094"><pair kern="-11" kpx2="1086"/><pair kern="-11" kpx2="1089"/><pair kern="-11" kpx2="1077"/><pair kern="-11" kpx2="1079"/></kerning><kerning kpx1="8216"><pair kern="-18" kpx2="8216"/></kerning><kerning kpx1="1070"><pair kern="-11" kpx2="1054"/><pair kern="-11" kpx2="1084"/><pair kern="-11" kpx2="1057"/><pair kern="-44" kpx2="1051"/><pair kern="-33" kpx2="1040"/><pair kern="-44" kpx2="1076"/><pair kern="-43" kpx2="1044"/><pair kern="-44" kpx2="1061"/><pair kern="-21" kpx2="1046"/><pair kern="-33" kpx2="1063"/><pair kern="-56" kpx2="1058"/><pair kern="-44" kpx2="1083"/></kerning><kerning kpx1="1092"><pair kern="-11" kpx2="1103"/><pair kern="-11" kpx2="1091"/><pair kern="-21" kpx2="1076"/><pair kern="-21" kpx2="1095"/><pair kern="-21" kpx2="1090"/><pair kern="-11" kpx2="1073"/><pair kern="-21" kpx2="1083"/></kerning><kerning kpx1="933"><pair kern="-90" kpx2="972"/><pair kern="-90" kpx2="963"/><pair kern="-56" kpx2="927"/><pair kern="-37" kpx2="943"/><pair kern="-47" kpx2="947"/><pair kern="-37" kpx2="953"/><pair kern="-74" kpx2="916"/><pair kern="-18" kpx2="160"/><pair kern="-90" kpx2="966"/><pair kern="-47" kpx2="937"/><pair kern="-74" kpx2="913"/><pair kern="-90" kpx2="945"/><pair kern="-74" kpx2="923"/><pair kern="-55" kpx2="58"/><pair kern="-74" kpx2="951"/><pair kern="-74" kpx2="954"/><pair kern="91" kpx2="912"/><pair kern="-90" kpx2="959"/><pair kern="-127" kpx2="44"/><pair kern="-90" kpx2="173"/><pair kern="59" kpx2="970"/><pair kern="-55" kpx2="894"/><pair kern="-56" kpx2="920"/><pair kern="-74" kpx2="942"/><pair kern="-74" kpx2="956"/><pair kern="-127" kpx2="46"/><pair kern="-56" kpx2="934"/></kerning><kerning kpx1="102"><pair kern="-18" kpx2="102"/><pair kern="18" kpx2="8217"/></kerning><kerning kpx1="1074"><pair kern="-11" kpx2="1077"/><pair kern="-11" kpx2="1084"/><pair kern="-33" kpx2="1098"/><pair kern="-11" kpx2="1076"/><pair kern="-21" kpx2="1090"/><pair kern="-11" kpx2="1092"/><pair kern="-11" kpx2="1103"/><pair kern="-11" kpx2="1086"/><pair kern="-11" kpx2="1089"/><pair kern="-11" kpx2="1079"/><pair kern="-21" kpx2="1091"/><pair kern="-11" kpx2="1072"/><pair kern="-44" kpx2="1095"/><pair kern="-11" kpx2="1078"/><pair kern="-11" kpx2="1073"/><pair kern="-22" kpx2="1083"/></kerning><kerning kpx1="84"><pair kern="-110" kpx2="111"/><pair kern="-18" kpx2="79"/><pair kern="-55" kpx2="119"/><pair kern="-110" kpx2="58"/><pair kern="-37" kpx2="114"/><pair kern="-110" kpx2="99"/><pair kern="-110" kpx2="44"/><pair kern="-37" kpx2="105"/><pair kern="-55" kpx2="173"/><pair kern="-74" kpx2="65"/><pair kern="-110" kpx2="97"/><pair kern="-18" kpx2="160"/><pair kern="-110" kpx2="894"/><pair kern="-37" kpx2="117"/><pair kern="-55" kpx2="121"/><pair kern="-110" kpx2="46"/><pair kern="-110" kpx2="115"/><pair kern="-110" kpx2="101"/></kerning><kerning kpx1="934"><pair kern="-32" kpx2="933"/><pair kern="-32" kpx2="939"/><pair kern="-28" kpx2="913"/></kerning><kerning kpx1="1073"><pair kern="-33" kpx2="1093"/><pair kern="-11" kpx2="1077"/><pair kern="-11" kpx2="1101"/><pair kern="-21" kpx2="1084"/><pair kern="-33" kpx2="1098"/><pair kern="-44" kpx2="1076"/><pair kern="-11" kpx2="1092"/><pair kern="-21" kpx2="1103"/><pair kern="-11" kpx2="1089"/><pair kern="-21" kpx2="1079"/><pair kern="-21" kpx2="1091"/><pair kern="-22" kpx2="1072"/><pair kern="-33" kpx2="1095"/><pair kern="-11" kpx2="1078"/><pair kern="-44" kpx2="1083"/></kerning><kerning kpx1="1056"><pair kern="-43" kpx2="1077"/><pair kern="-21" kpx2="58"/><pair kern="-21" kpx2="1101"/><pair kern="-11" kpx2="1052"/><pair kern="-78" kpx2="1076"/><pair kern="-66" kpx2="1044"/><pair kern="-44" kpx2="1061"/><pair kern="-56" kpx2="187"/><pair kern="-44" kpx2="1058"/><pair kern="-188" kpx2="44"/><pair kern="-33" kpx2="1103"/><pair kern="-43" kpx2="1086"/><pair kern="-21" kpx2="1071"/><pair kern="-21" kpx2="1054"/><pair kern="-11" kpx2="1060"/><pair kern="-21" kpx2="894"/><pair kern="-21" kpx2="1047"/><pair kern="-11" kpx2="1057"/><pair kern="-33" kpx2="1072"/><pair kern="-66" kpx2="1040"/><pair kern="-56" kpx2="1051"/><pair kern="-188" kpx2="46"/><pair kern="-21" kpx2="1059"/><pair kern="-11" kpx2="1046"/></kerning><kerning kpx1="1077"><pair kern="-21" kpx2="1093"/><pair kern="-21" kpx2="1079"/><pair kern="-11" kpx2="1091"/><pair kern="-21" kpx2="1076"/><pair kern="-33" kpx2="1095"/><pair kern="-11" kpx2="1078"/><pair kern="-33" kpx2="1090"/><pair kern="-11" kpx2="1073"/><pair kern="-33" kpx2="1083"/></kerning><kerning kpx1="1066"><pair kern="-33" kpx2="1071"/><pair kern="-66" kpx2="8217"/></kerning><kerning kpx1="49"><pair kern="-74" kpx2="49"/></kerning><kerning kpx1="916"><pair kern="-74" kpx2="933"/><pair kern="-55" kpx2="160"/><pair kern="-20" kpx2="920"/><pair kern="-74" kpx2="939"/><pair kern="-20" kpx2="927"/><pair kern="-58" kpx2="932"/></kerning><kerning kpx1="952"><pair kern="-19" kpx2="955"/></kerning><kerning kpx1="1042"><pair kern="-11" kpx2="1093"/><pair kern="-11" kpx2="1084"/><pair kern="-11" kpx2="1076"/><pair kern="-21" kpx2="1044"/><pair kern="-56" kpx2="1066"/><pair kern="-43" kpx2="1061"/><pair kern="-33" kpx2="1090"/><pair kern="-66" kpx2="1058"/><pair kern="-11" kpx2="1103"/><pair kern="-33" kpx2="1071"/><pair kern="-33" kpx2="1054"/><pair kern="-33" kpx2="1060"/><pair kern="-11" kpx2="1091"/><pair kern="-33" kpx2="1047"/><pair kern="-33" kpx2="1057"/><pair kern="-33" kpx2="1040"/><pair kern="-11" kpx2="1051"/><pair kern="-33" kpx2="1059"/><pair kern="-33" kpx2="1095"/><pair kern="-21" kpx2="1046"/><pair kern="-44" kpx2="1063"/></kerning><kerning kpx1="902"><pair kern="-18" kpx2="967"/><pair kern="-74" kpx2="933"/><pair kern="-18" kpx2="957"/><pair kern="-20" kpx2="920"/><pair kern="-74" kpx2="939"/><pair kern="-20" kpx2="927"/><pair kern="-28" kpx2="934"/><pair kern="-74" kpx2="932"/><pair kern="-18" kpx2="947"/></kerning><kerning kpx1="1078"><pair kern="11" kpx2="1091"/><pair kern="21" kpx2="1098"/><pair kern="-11" kpx2="1095"/><pair kern="11" kpx2="1073"/></kerning><kerning kpx1="1068"><pair kern="-11" kpx2="1069"/><pair kern="-21" kpx2="1052"/><pair kern="-21" kpx2="1044"/><pair kern="-44" kpx2="1061"/><pair kern="-100" kpx2="1058"/><pair kern="-78" kpx2="8217"/><pair kern="-44" kpx2="1071"/><pair kern="-21" kpx2="1054"/><pair kern="-11" kpx2="1047"/><pair kern="-21" kpx2="1057"/><pair kern="-21" kpx2="1040"/><pair kern="-34" kpx2="1051"/><pair kern="-33" kpx2="1046"/><pair kern="-78" kpx2="1063"/></kerning><kerning kpx1="1168"><pair kern="-21" kpx2="58"/><pair kern="-78" kpx2="171"/><pair kern="-21" kpx2="894"/><pair kern="-122" kpx2="46"/><pair kern="-78" kpx2="187"/><pair kern="-21" kpx2="8212"/><pair kern="-122" kpx2="44"/></kerning><kerning kpx1="1093"><pair kern="-11" kpx2="1086"/><pair kern="-11" kpx2="1089"/><pair kern="-11" kpx2="1077"/><pair kern="-11" kpx2="1079"/><pair kern="-11" kpx2="1072"/><pair kern="-21" kpx2="1095"/><pair kern="-11" kpx2="1092"/><pair kern="-11" kpx2="1090"/><pair kern="-11" kpx2="1073"/></kerning><kerning kpx1="1065"><pair kern="21" kpx2="1091"/><pair kern="11" kpx2="1072"/></kerning><kerning kpx1="1076"><pair kern="11" kpx2="1101"/><pair kern="-21" kpx2="1098"/></kerning><kerning kpx1="1102"><pair kern="-11" kpx2="1093"/><pair kern="-11" kpx2="1084"/><pair kern="-21" kpx2="1076"/><pair kern="-21" kpx2="1095"/><pair kern="-11" kpx2="1078"/><pair kern="-21" kpx2="1090"/><pair kern="-21" kpx2="1083"/></kerning><kerning kpx1="1044"><pair kern="11" kpx2="1086"/><pair kern="-21" kpx2="1060"/><pair kern="33" kpx2="1079"/><pair kern="21" kpx2="1091"/><pair kern="11" kpx2="1059"/><pair kern="-34" kpx2="1063"/></kerning><kerning kpx1="1043"><pair kern="-56" kpx2="1088"/><pair kern="-66" kpx2="1077"/><pair kern="-66" kpx2="171"/><pair kern="-56" kpx2="1085"/><pair kern="-56" kpx2="1080"/><pair kern="-66" kpx2="187"/><pair kern="-21" kpx2="8212"/><pair kern="-66" kpx2="1086"/><pair kern="-56" kpx2="1099"/><pair kern="-66" kpx2="1091"/><pair kern="-44" kpx2="1057"/><pair kern="-21" kpx2="1047"/><pair kern="-66" kpx2="1040"/><pair kern="-56" kpx2="1084"/><pair kern="-22" kpx2="1052"/><pair kern="-66" kpx2="1076"/><pair kern="-56" kpx2="1102"/><pair kern="-66" kpx2="1044"/><pair kern="-122" kpx2="44"/><pair kern="-66" kpx2="1103"/><pair kern="-33" kpx2="1071"/><pair kern="-56" kpx2="1054"/><pair kern="-56" kpx2="1074"/><pair kern="-56" kpx2="1072"/><pair kern="-56" kpx2="1051"/><pair kern="-56" kpx2="1100"/><pair kern="-122" kpx2="46"/><pair kern="-56" kpx2="1083"/></kerning><kerning kpx1="8217"><pair kern="-37" kpx2="160"/><pair kern="-18" kpx2="115"/><pair kern="-18" kpx2="8217"/></kerning><kerning kpx1="1054"><pair kern="-11" kpx2="1093"/><pair kern="-21" kpx2="1071"/><pair kern="-11" kpx2="1051"/><pair kern="-21" kpx2="1040"/><pair kern="-21" kpx2="1076"/><pair kern="-21" kpx2="1059"/><pair kern="-21" kpx2="1044"/><pair kern="-44" kpx2="1061"/><pair kern="-21" kpx2="1046"/><pair kern="-21" kpx2="1063"/><pair kern="-11" kpx2="1083"/></kerning><kerning kpx1="911"><pair kern="-22" kpx2="933"/><pair kern="-22" kpx2="939"/></kerning><kerning kpx1="1075"><pair kern="-11" kpx2="1103"/><pair kern="-21" kpx2="1086"/><pair kern="-21" kpx2="1089"/><pair kern="-21" kpx2="1077"/><pair kern="-11" kpx2="1079"/><pair kern="-21" kpx2="1072"/><pair kern="-44" kpx2="1076"/><pair kern="-122" kpx2="46"/><pair kern="-21" kpx2="1083"/><pair kern="-122" kpx2="44"/></kerning><kerning kpx1="948"><pair kern="-14" kpx2="960"/><pair kern="-19" kpx2="955"/><pair kern="-26" kpx2="967"/><pair kern="-14" kpx2="964"/></kerning><kerning kpx1="89"><pair kern="-91" kpx2="111"/><pair kern="-55" kpx2="58"/><pair kern="-74" kpx2="112"/><pair kern="-91" kpx2="113"/><pair kern="-55" kpx2="118"/><pair kern="-128" kpx2="44"/><pair kern="-37" kpx2="105"/><pair kern="-91" kpx2="173"/><pair kern="-74" kpx2="65"/><pair kern="-74" kpx2="97"/><pair kern="-18" kpx2="160"/><pair kern="-64" kpx2="894"/><pair kern="-55" kpx2="117"/><pair kern="-128" kpx2="46"/><pair kern="-91" kpx2="101"/></kerning></font-metrics>
\ No newline at end of file
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/arialbd.ttf b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/arialbd.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..f09499b0911d57496c95466db34e06e0a2d6d9d1
Binary files /dev/null and b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/arialbd.ttf differ
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/arialbd.xml b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/arialbd.xml
new file mode 100755
index 0000000000000000000000000000000000000000..5ce65a20d50e5004c822e9ba00214519b5cc5dc2
--- /dev/null
+++ b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/arialbd.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><font-metrics metrics-version="2" type="TYPE0"><font-name>Arial,Bold</font-name><embed/><cap-height>715</cap-height><x-height>518</x-height><ascender>728</ascender><descender>-210</descender><bbox><left>-627</left><bottom>-376</bottom><right>2033</right><top>1047</top></bbox><flags>32</flags><stemv>0</stemv><italicangle>0</italicangle><subtype>TYPE0</subtype><multibyte-extras><cid-type>CIDFontType2</cid-type><default-width>0</default-width><bfranges><bf gi="3" ue="126" us="32"/><bf gi="3" ue="160" us="160"/><bf gi="163" ue="161" us="161"/><bf gi="132" ue="163" us="162"/><bf gi="862" ue="164" us="164"/><bf gi="150" ue="165" us="165"/><bf gi="230" ue="166" us="166"/><bf gi="134" ue="167" us="167"/><bf gi="142" ue="168" us="168"/><bf gi="139" ue="169" us="169"/><bf gi="157" ue="170" us="170"/><bf gi="169" ue="171" us="171"/><bf gi="164" ue="172" us="172"/><bf gi="16" ue="173" us="173"/><bf gi="138" ue="174" us="174"/><bf gi="256" ue="175" us="175"/><bf gi="131" ue="176" us="176"/><bf gi="147" ue="177" us="177"/><bf gi="240" ue="179" us="178"/><bf gi="141" ue="180" us="180"/><bf gi="151" ue="181" us="181"/><bf gi="136" ue="182" us="182"/><bf gi="194" ue="183" us="183"/><bf gi="220" ue="184" us="184"/><bf gi="239" ue="185" us="185"/><bf gi="158" ue="186" us="186"/><bf gi="170" ue="187" us="187"/><bf gi="243" ue="188" us="188"/><bf gi="242" ue="189" us="189"/><bf gi="244" ue="190" us="190"/><bf gi="162" ue="191" us="191"/><bf gi="172" ue="192" us="192"/><bf gi="200" ue="193" us="193"/><bf gi="198" ue="194" us="194"/><bf gi="173" ue="195" us="195"/><bf gi="98" ue="197" us="196"/><bf gi="144" ue="198" us="198"/><bf gi="100" ue="199" us="199"/><bf gi="202" ue="200" us="200"/><bf gi="101" ue="201" us="201"/><bf gi="199" ue="202" us="202"/><bf gi="201" ue="203" us="203"/><bf gi="206" ue="204" us="204"/><bf gi="203" ue="207" us="205"/><bf gi="231" ue="208" us="208"/><bf gi="102" ue="209" us="209"/><bf gi="209" ue="210" us="210"/><bf gi="207" ue="212" us="211"/><bf gi="174" ue="213" us="213"/><bf gi="103" ue="214" us="214"/><bf gi="238" ue="215" us="215"/><bf gi="145" ue="216" us="216"/><bf gi="212" ue="217" us="217"/><bf gi="210" ue="219" us="218"/><bf gi="104" ue="220" us="220"/><bf gi="233" ue="221" us="221"/><bf gi="235" ue="222" us="222"/><bf gi="137" ue="223" us="223"/><bf gi="106" ue="224" us="224"/><bf gi="105" ue="225" us="225"/><bf gi="107" ue="226" us="226"/><bf gi="109" ue="227" us="227"/><bf gi="108" ue="228" us="228"/><bf gi="110" ue="229" us="229"/><bf gi="160" ue="230" us="230"/><bf gi="111" ue="231" us="231"/><bf gi="113" ue="232" us="232"/><bf gi="112" ue="233" us="233"/><bf gi="114" ue="235" us="234"/><bf gi="117" ue="236" us="236"/><bf gi="116" ue="237" us="237"/><bf gi="118" ue="239" us="238"/><bf gi="232" ue="240" us="240"/><bf gi="120" ue="241" us="241"/><bf gi="122" ue="242" us="242"/><bf gi="121" ue="243" us="243"/><bf gi="123" ue="244" us="244"/><bf gi="125" ue="245" us="245"/><bf gi="124" ue="246" us="246"/><bf gi="183" ue="247" us="247"/><bf gi="161" ue="248" us="248"/><bf gi="127" ue="249" us="249"/><bf gi="126" ue="250" us="250"/><bf gi="128" ue="252" us="251"/><bf gi="234" ue="253" us="253"/><bf gi="236" ue="254" us="254"/><bf gi="185" ue="255" us="255"/><bf gi="406" ue="257" us="256"/><bf gi="258" ue="261" us="258"/><bf gi="251" ue="263" us="262"/><bf gi="408" ue="267" us="264"/><bf gi="253" ue="269" us="268"/><bf gi="262" ue="272" us="270"/><bf gi="255" ue="273" us="273"/><bf gi="412" ue="279" us="274"/><bf gi="265" ue="283" us="280"/><bf gi="418" ue="285" us="284"/><bf gi="246" ue="287" us="286"/><bf gi="420" ue="303" us="288"/><bf gi="248" ue="304" us="304"/><bf gi="213" ue="305" us="305"/><bf gi="394" ue="307" us="306"/><bf gi="436" ue="312" us="308"/><bf gi="269" ue="314" us="313"/><bf gi="441" ue="316" us="315"/><bf gi="271" ue="320" us="317"/><bf gi="224" ue="322" us="321"/><bf gi="275" ue="324" us="323"/><bf gi="443" ue="326" us="325"/><bf gi="277" ue="328" us="327"/><bf gi="396" ue="329" us="329"/><bf gi="445" ue="335" us="330"/><bf gi="279" ue="337" us="336"/><bf gi="175" ue="339" us="338"/><bf gi="281" ue="341" us="340"/><bf gi="451" ue="343" us="342"/><bf gi="283" ue="347" us="344"/><bf gi="453" ue="349" us="348"/><bf gi="249" ue="351" us="350"/><bf gi="226" ue="353" us="352"/><bf gi="287" ue="357" us="354"/><bf gi="455" ue="365" us="358"/><bf gi="291" ue="369" us="366"/><bf gi="463" ue="375" us="370"/><bf gi="186" ue="376" us="376"/><bf gi="295" ue="380" us="377"/><bf gi="228" ue="382" us="381"/><bf gi="469" ue="383" us="383"/><bf gi="166" ue="402" us="402"/><bf gi="1130" ue="417" us="416"/><bf gi="1132" ue="432" us="431"/><bf gi="1276" ue="476" us="461"/><bf gi="470" ue="511" us="506"/><bf gi="214" ue="710" us="710"/><bf gi="223" ue="711" us="711"/><bf gi="216" ue="713" us="713"/><bf gi="217" ue="730" us="728"/><bf gi="222" ue="731" us="731"/><bf gi="215" ue="732" us="732"/><bf gi="221" ue="733" us="733"/><bf gi="1170" ue="769" us="768"/><bf gi="1146" ue="771" us="771"/><bf gi="1140" ue="777" us="777"/><bf gi="1173" ue="803" us="803"/><bf gi="30" ue="894" us="894"/><bf gi="495" ue="902" us="900"/><bf gi="476" ue="903" us="903"/><bf gi="498" ue="906" us="904"/><bf gi="501" ue="908" us="908"/><bf gi="502" ue="914" us="910"/><bf gi="299" ue="915" us="915"/><bf gi="507" ue="919" us="916"/><bf gi="300" ue="920" us="920"/><bf gi="511" ue="929" us="921"/><bf gi="520" ue="933" us="931"/><bf gi="301" ue="934" us="934"/><bf gi="523" ue="944" us="935"/><bf gi="302" ue="945" us="945"/><bf gi="533" ue="947" us="946"/><bf gi="303" ue="949" us="948"/><bf gi="535" ue="959" us="950"/><bf gi="652" ue="960" us="960"/><bf gi="545" ue="962" us="961"/><bf gi="305" ue="964" us="963"/><bf gi="547" ue="965" us="965"/><bf gi="307" ue="966" us="966"/><bf gi="548" ue="974" us="967"/><bf gi="556" ue="1036" us="1025"/><bf gi="568" ue="1103" us="1038"/><bf gi="634" ue="1116" us="1105"/><bf gi="646" ue="1119" us="1118"/><bf gi="648" ue="1169" us="1168"/><bf gi="653" ue="1465" us="1456"/><bf gi="663" ue="1475" us="1467"/><bf gi="672" ue="1514" us="1488"/><bf gi="699" ue="1524" us="1520"/><bf gi="748" ue="1548" us="1548"/><bf gi="749" ue="1563" us="1563"/><bf gi="750" ue="1567" us="1567"/><bf gi="751" ue="1569" us="1569"/><bf gi="897" ue="1570" us="1570"/><bf gi="899" ue="1571" us="1571"/><bf gi="901" ue="1572" us="1572"/><bf gi="903" ue="1573" us="1573"/><bf gi="905" ue="1574" us="1574"/><bf gi="909" ue="1575" us="1575"/><bf gi="911" ue="1576" us="1576"/><bf gi="915" ue="1577" us="1577"/><bf gi="917" ue="1578" us="1578"/><bf gi="921" ue="1579" us="1579"/><bf gi="925" ue="1580" us="1580"/><bf gi="929" ue="1581" us="1581"/><bf gi="933" ue="1582" us="1582"/><bf gi="937" ue="1583" us="1583"/><bf gi="939" ue="1584" us="1584"/><bf gi="941" ue="1585" us="1585"/><bf gi="943" ue="1586" us="1586"/><bf gi="945" ue="1587" us="1587"/><bf gi="949" ue="1588" us="1588"/><bf gi="953" ue="1589" us="1589"/><bf gi="957" ue="1590" us="1590"/><bf gi="961" ue="1591" us="1591"/><bf gi="965" ue="1592" us="1592"/><bf gi="969" ue="1593" us="1593"/><bf gi="973" ue="1594" us="1594"/><bf gi="752" ue="1600" us="1600"/><bf gi="977" ue="1601" us="1601"/><bf gi="981" ue="1602" us="1602"/><bf gi="985" ue="1603" us="1603"/><bf gi="989" ue="1604" us="1604"/><bf gi="993" ue="1605" us="1605"/><bf gi="997" ue="1606" us="1606"/><bf gi="1001" ue="1607" us="1607"/><bf gi="1005" ue="1608" us="1608"/><bf gi="1007" ue="1609" us="1609"/><bf gi="1009" ue="1610" us="1610"/><bf gi="753" ue="1618" us="1611"/><bf gi="761" ue="1643" us="1632"/><bf gi="773" ue="1645" us="1645"/><bf gi="797" ue="1649" us="1649"/><bf gi="799" ue="1662" us="1662"/><bf gi="807" ue="1670" us="1670"/><bf gi="811" ue="1688" us="1688"/><bf gi="803" ue="1700" us="1700"/><bf gi="813" ue="1705" us="1705"/><bf gi="817" ue="1711" us="1711"/><bf gi="821" ue="1740" us="1740"/><bf gi="776" ue="1749" us="1749"/><bf gi="761" ue="1779" us="1776"/><bf gi="778" ue="1782" us="1780"/><bf gi="768" ue="1785" us="1783"/><bf gi="477" ue="7813" us="7808"/><bf gi="1188" ue="7921" us="7840"/><bf gi="483" ue="7923" us="7922"/><bf gi="1270" ue="7929" us="7924"/><bf gi="744" ue="8207" us="8204"/><bf gi="177" ue="8212" us="8211"/><bf gi="650" ue="8213" us="8213"/><bf gi="308" ue="8215" us="8215"/><bf gi="181" ue="8217" us="8216"/><bf gi="195" ue="8218" us="8218"/><bf gi="485" ue="8219" us="8219"/><bf gi="179" ue="8221" us="8220"/><bf gi="196" ue="8222" us="8222"/><bf gi="130" ue="8224" us="8224"/><bf gi="193" ue="8225" us="8225"/><bf gi="135" ue="8226" us="8226"/><bf gi="171" ue="8230" us="8230"/><bf gi="846" ue="8235" us="8234"/><bf gi="850" ue="8236" us="8236"/><bf gi="848" ue="8238" us="8237"/><bf gi="197" ue="8240" us="8240"/><bf gi="397" ue="8243" us="8242"/><bf gi="189" ue="8250" us="8249"/><bf gi="309" ue="8252" us="8252"/><bf gi="486" ue="8254" us="8254"/><bf gi="187" ue="8260" us="8260"/><bf gi="853" ue="8301" us="8298"/><bf gi="851" ue="8303" us="8302"/><bf gi="310" ue="8319" us="8319"/><bf gi="245" ue="8355" us="8355"/><bf gi="487" ue="8356" us="8356"/><bf gi="311" ue="8359" us="8359"/><bf gi="704" ue="8362" us="8362"/><bf gi="1150" ue="8363" us="8363"/><bf gi="188" ue="8364" us="8364"/><bf gi="399" ue="8453" us="8453"/><bf gi="400" ue="8467" us="8467"/><bf gi="651" ue="8470" us="8470"/><bf gi="140" ue="8482" us="8482"/><bf gi="159" ue="8486" us="8486"/><bf gi="488" ue="8494" us="8494"/><bf gi="1151" ue="8532" us="8531"/><bf gi="489" ue="8542" us="8539"/><bf gi="312" ue="8597" us="8592"/><bf gi="318" ue="8616" us="8616"/><bf gi="152" ue="8706" us="8706"/><bf gi="168" ue="8710" us="8710"/><bf gi="154" ue="8719" us="8719"/><bf gi="153" ue="8721" us="8721"/><bf gi="237" ue="8722" us="8722"/><bf gi="187" ue="8725" us="8725"/><bf gi="194" ue="8729" us="8729"/><bf gi="165" ue="8730" us="8730"/><bf gi="146" ue="8734" us="8734"/><bf gi="319" ue="8735" us="8735"/><bf gi="320" ue="8745" us="8745"/><bf gi="156" ue="8747" us="8747"/><bf gi="167" ue="8776" us="8776"/><bf gi="143" ue="8800" us="8800"/><bf gi="321" ue="8801" us="8801"/><bf gi="148" ue="8805" us="8804"/><bf gi="322" ue="8962" us="8962"/><bf gi="323" ue="8976" us="8976"/><bf gi="324" ue="8993" us="8992"/><bf gi="326" ue="9472" us="9472"/><bf gi="327" ue="9474" us="9474"/><bf gi="328" ue="9484" us="9484"/><bf gi="329" ue="9488" us="9488"/><bf gi="330" ue="9492" us="9492"/><bf gi="331" ue="9496" us="9496"/><bf gi="332" ue="9500" us="9500"/><bf gi="333" ue="9508" us="9508"/><bf gi="334" ue="9516" us="9516"/><bf gi="335" ue="9524" us="9524"/><bf gi="336" ue="9532" us="9532"/><bf gi="337" ue="9580" us="9552"/><bf gi="366" ue="9600" us="9600"/><bf gi="367" ue="9604" us="9604"/><bf gi="368" ue="9608" us="9608"/><bf gi="369" ue="9612" us="9612"/><bf gi="370" ue="9619" us="9616"/><bf gi="374" ue="9632" us="9632"/><bf gi="401" ue="9633" us="9633"/><bf gi="402" ue="9643" us="9642"/><bf gi="375" ue="9644" us="9644"/><bf gi="376" ue="9650" us="9650"/><bf gi="377" ue="9658" us="9658"/><bf gi="378" ue="9660" us="9660"/><bf gi="379" ue="9668" us="9668"/><bf gi="184" ue="9674" us="9674"/><bf gi="380" ue="9675" us="9675"/><bf gi="404" ue="9679" us="9679"/><bf gi="381" ue="9689" us="9688"/><bf gi="405" ue="9702" us="9702"/><bf gi="383" ue="9788" us="9786"/><bf gi="386" ue="9792" us="9792"/><bf gi="387" ue="9794" us="9794"/><bf gi="388" ue="9824" us="9824"/><bf gi="389" ue="9827" us="9827"/><bf gi="390" ue="9830" us="9829"/><bf gi="392" ue="9835" us="9834"/><bf gi="705" ue="59397" us="59393"/><bf gi="786" ue="59416" us="59416"/><bf gi="795" ue="59450" us="59450"/><bf gi="191" ue="61442" us="61441"/><bf gi="493" ue="61445" us="61444"/><bf gi="1137" ue="61447" us="61446"/><bf gi="1153" ue="61448" us="61448"/><bf gi="1139" ue="61449" us="61449"/><bf gi="857" ue="61454" us="61450"/><bf gi="1156" ue="61455" us="61455"/><bf gi="1141" ue="61456" us="61456"/><bf gi="1143" ue="61457" us="61457"/><bf gi="1157" ue="61458" us="61458"/><bf gi="1142" ue="61459" us="61459"/><bf gi="1158" ue="61460" us="61460"/><bf gi="1145" ue="61461" us="61461"/><bf gi="1159" ue="61467" us="61462"/><bf gi="1144" ue="61468" us="61468"/><bf gi="1172" ue="61469" us="61469"/><bf gi="1165" ue="61474" us="61470"/><bf gi="1174" ue="61475" us="61475"/><bf gi="1178" ue="61480" us="61476"/><bf gi="1175" ue="61483" us="61481"/><bf gi="1149" ue="61484" us="61484"/><bf gi="1183" ue="61489" us="61485"/><bf gi="191" ue="64258" us="64257"/><bf gi="710" ue="64288" us="64288"/><bf gi="711" ue="64310" us="64298"/><bf gi="724" ue="64316" us="64312"/><bf gi="729" ue="64318" us="64318"/><bf gi="730" ue="64321" us="64320"/><bf gi="732" ue="64324" us="64323"/><bf gi="734" ue="64335" us="64326"/><bf gi="799" ue="64345" us="64342"/><bf gi="807" ue="64381" us="64378"/><bf gi="811" ue="64395" us="64394"/><bf gi="813" ue="64405" us="64398"/><bf gi="821" ue="64509" us="64508"/><bf gi="839" ue="64610" us="64606"/><bf gi="892" ue="64831" us="64830"/><bf gi="895" ue="65010" us="65010"/><bf gi="896" ue="65276" us="65152"/><bf gi="863" ue="65532" us="65532"/><bf gi="0" ue="65535" us="65535"/></bfranges><cid-widths start-index="0"><wx w="750"/><wx w="0"/><wx w="277"/><wx w="277"/><wx w="333"/><wx w="474"/><wx w="556"/><wx w="556"/><wx w="889"/><wx w="722"/><wx w="237"/><wx w="333"/><wx w="333"/><wx w="389"/><wx w="583"/><wx w="277"/><wx w="333"/><wx w="277"/><wx w="277"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="333"/><wx w="333"/><wx w="583"/><wx w="583"/><wx w="583"/><wx w="610"/><wx w="975"/><wx w="722"/><wx w="722"/><wx w="722"/><wx w="722"/><wx w="666"/><wx w="610"/><wx w="777"/><wx w="722"/><wx w="277"/><wx w="556"/><wx w="722"/><wx w="610"/><wx w="833"/><wx w="722"/><wx w="777"/><wx w="666"/><wx w="777"/><wx w="722"/><wx w="666"/><wx w="610"/><wx w="722"/><wx w="666"/><wx w="943"/><wx w="666"/><wx w="666"/><wx w="610"/><wx w="333"/><wx w="277"/><wx w="333"/><wx w="583"/><wx w="556"/><wx w="333"/><wx w="556"/><wx w="610"/><wx w="556"/><wx w="610"/><wx w="556"/><wx w="333"/><wx w="610"/><wx w="610"/><wx w="277"/><wx w="277"/><wx w="556"/><wx w="277"/><wx w="889"/><wx w="610"/><wx w="610"/><wx w="610"/><wx w="610"/><wx w="389"/><wx w="556"/><wx w="333"/><wx w="610"/><wx w="556"/><wx w="777"/><wx w="556"/><wx w="556"/><wx w="500"/><wx w="389"/><wx w="279"/><wx w="389"/><wx w="583"/><wx w="722"/><wx w="722"/><wx w="722"/><wx w="666"/><wx w="722"/><wx w="777"/><wx w="722"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="277"/><wx w="277"/><wx w="277"/><wx w="277"/><wx w="610"/><wx w="610"/><wx w="610"/><wx w="610"/><wx w="610"/><wx w="610"/><wx w="610"/><wx w="610"/><wx w="610"/><wx w="610"/><wx w="556"/><wx w="399"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="350"/><wx w="556"/><wx w="610"/><wx w="736"/><wx w="736"/><wx w="1000"/><wx w="333"/><wx w="333"/><wx w="548"/><wx w="1000"/><wx w="777"/><wx w="712"/><wx w="548"/><wx w="548"/><wx w="548"/><wx w="556"/><wx w="576"/><wx w="494"/><wx w="712"/><wx w="823"/><wx w="548"/><wx w="273"/><wx w="370"/><wx w="365"/><wx w="768"/><wx w="889"/><wx w="610"/><wx w="610"/><wx w="333"/><wx w="583"/><wx w="548"/><wx w="556"/><wx w="548"/><wx w="611"/><wx w="556"/><wx w="556"/><wx w="1000"/><wx w="722"/><wx w="722"/><wx w="777"/><wx w="1000"/><wx w="943"/><wx w="556"/><wx w="1000"/><wx w="500"/><wx w="500"/><wx w="277"/><wx w="277"/><wx w="548"/><wx w="494"/><wx w="556"/><wx w="666"/><wx w="166"/><wx w="556"/><wx w="333"/><wx w="333"/><wx w="610"/><wx w="610"/><wx w="556"/><wx w="277"/><wx w="277"/><wx w="500"/><wx w="1000"/><wx w="722"/><wx w="666"/><wx w="722"/><wx w="666"/><wx w="666"/><wx w="277"/><wx w="277"/><wx w="277"/><wx w="277"/><wx w="777"/><wx w="777"/><wx w="777"/><wx w="722"/><wx w="722"/><wx w="722"/><wx w="277"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="610"/><wx w="277"/><wx w="666"/><wx w="556"/><wx w="610"/><wx w="500"/><wx w="279"/><wx w="722"/><wx w="610"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="610"/><wx w="583"/><wx w="583"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="833"/><wx w="833"/><wx w="833"/><wx w="556"/><wx w="777"/><wx w="610"/><wx w="277"/><wx w="666"/><wx w="556"/><wx w="722"/><wx w="556"/><wx w="722"/><wx w="556"/><wx w="610"/><wx w="552"/><wx w="333"/><wx w="722"/><wx w="556"/><wx w="722"/><wx w="556"/><wx w="722"/><wx w="718"/><wx w="722"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="610"/><wx w="277"/><wx w="610"/><wx w="385"/><wx w="610"/><wx w="479"/><wx w="722"/><wx w="610"/><wx w="722"/><wx w="610"/><wx w="777"/><wx w="610"/><wx w="722"/><wx w="389"/><wx w="722"/><wx w="389"/><wx w="666"/><wx w="556"/><wx w="610"/><wx w="333"/><wx w="610"/><wx w="479"/><wx w="722"/><wx w="610"/><wx w="722"/><wx w="610"/><wx w="610"/><wx w="500"/><wx w="610"/><wx w="500"/><wx w="601"/><wx w="777"/><wx w="820"/><wx w="614"/><wx w="606"/><wx w="474"/><wx w="684"/><wx w="446"/><wx w="715"/><wx w="552"/><wx w="604"/><wx w="395"/><wx w="1093"/><wx w="1000"/><wx w="500"/><wx w="1000"/><wx w="500"/><wx w="1000"/><wx w="500"/><wx w="500"/><wx w="979"/><wx w="722"/><wx w="583"/><wx w="604"/><wx w="583"/><wx w="604"/><wx w="604"/><wx w="708"/><wx w="625"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="729"/><wx w="604"/><wx w="1000"/><wx w="989"/><wx w="989"/><wx w="989"/><wx w="989"/><wx w="604"/><wx w="604"/><wx w="604"/><wx w="1020"/><wx w="1052"/><wx w="916"/><wx w="750"/><wx w="750"/><wx w="531"/><wx w="656"/><wx w="593"/><wx w="510"/><wx w="500"/><wx w="750"/><wx w="784"/><wx w="556"/><wx w="708"/><wx w="239"/><wx w="479"/><wx w="885"/><wx w="488"/><wx w="604"/><wx w="354"/><wx w="354"/><wx w="604"/><wx w="354"/><wx w="722"/><wx w="556"/><wx w="722"/><wx w="556"/><wx w="722"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="777"/><wx w="610"/><wx w="777"/><wx w="610"/><wx w="777"/><wx w="610"/><wx w="722"/><wx w="610"/><wx w="722"/><wx w="610"/><wx w="277"/><wx w="277"/><wx w="277"/><wx w="277"/><wx w="277"/><wx w="277"/><wx w="277"/><wx w="277"/><wx w="556"/><wx w="277"/><wx w="722"/><wx w="556"/><wx w="556"/><wx w="610"/><wx w="277"/><wx w="722"/><wx w="610"/><wx w="723"/><wx w="610"/><wx w="777"/><wx w="610"/><wx w="777"/><wx w="610"/><wx w="722"/><wx w="389"/><wx w="666"/><wx w="556"/><wx w="610"/><wx w="333"/><wx w="722"/><wx w="610"/><wx w="722"/><wx w="610"/><wx w="722"/><wx w="610"/><wx w="722"/><wx w="610"/><wx w="943"/><wx w="777"/><wx w="666"/><wx w="556"/><wx w="277"/><wx w="722"/><wx w="556"/><wx w="1000"/><wx w="889"/><wx w="777"/><wx w="610"/><wx w="333"/><wx w="943"/><wx w="777"/><wx w="943"/><wx w="777"/><wx w="943"/><wx w="777"/><wx w="666"/><wx w="556"/><wx w="277"/><wx w="333"/><wx w="556"/><wx w="600"/><wx w="833"/><wx w="833"/><wx w="833"/><wx w="833"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="464"/><wx w="722"/><wx w="853"/><wx w="905"/><wx w="473"/><wx w="824"/><wx w="927"/><wx w="837"/><wx w="277"/><wx w="722"/><wx w="722"/><wx w="718"/><wx w="666"/><wx w="610"/><wx w="722"/><wx w="277"/><wx w="722"/><wx w="666"/><wx w="833"/><wx w="722"/><wx w="643"/><wx w="777"/><wx w="722"/><wx w="666"/><wx w="600"/><wx w="610"/><wx w="666"/><wx w="666"/><wx w="809"/><wx w="801"/><wx w="277"/><wx w="666"/><wx w="614"/><wx w="451"/><wx w="610"/><wx w="277"/><wx w="582"/><wx w="610"/><wx w="556"/><wx w="460"/><wx w="610"/><wx w="540"/><wx w="277"/><wx w="557"/><wx w="556"/><wx w="611"/><wx w="556"/><wx w="445"/><wx w="610"/><wx w="618"/><wx w="520"/><wx w="582"/><wx w="575"/><wx w="753"/><wx w="844"/><wx w="277"/><wx w="582"/><wx w="610"/><wx w="582"/><wx w="844"/><wx w="668"/><wx w="885"/><wx w="566"/><wx w="711"/><wx w="666"/><wx w="277"/><wx w="275"/><wx w="556"/><wx w="1093"/><wx w="1062"/><wx w="875"/><wx w="610"/><wx w="622"/><wx w="718"/><wx w="722"/><wx w="718"/><wx w="722"/><wx w="566"/><wx w="712"/><wx w="666"/><wx w="903"/><wx w="626"/><wx w="718"/><wx w="718"/><wx w="610"/><wx w="701"/><wx w="833"/><wx w="722"/><wx w="777"/><wx w="718"/><wx w="666"/><wx w="722"/><wx w="610"/><wx w="622"/><wx w="853"/><wx w="666"/><wx w="730"/><wx w="702"/><wx w="1004"/><wx w="1019"/><wx w="869"/><wx w="979"/><wx w="718"/><wx w="711"/><wx w="1031"/><wx w="718"/><wx w="556"/><wx w="617"/><wx w="614"/><wx w="416"/><wx w="634"/><wx w="556"/><wx w="708"/><wx w="497"/><wx w="614"/><wx w="614"/><wx w="500"/><wx w="635"/><wx w="739"/><wx w="604"/><wx w="610"/><wx w="604"/><wx w="610"/><wx w="556"/><wx w="489"/><wx w="556"/><wx w="875"/><wx w="556"/><wx w="614"/><wx w="580"/><wx w="833"/><wx w="843"/><wx w="729"/><wx w="854"/><wx w="614"/><wx w="552"/><wx w="854"/><wx w="583"/><wx w="556"/><wx w="610"/><wx w="416"/><wx w="552"/><wx w="556"/><wx w="277"/><wx w="281"/><wx w="277"/><wx w="968"/><wx w="906"/><wx w="610"/><wx w="500"/><wx w="556"/><wx w="604"/><wx w="486"/><wx w="446"/><wx w="1000"/><wx w="1114"/><wx w="765"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="446"/><wx w="333"/><wx w="299"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="582"/><wx w="575"/><wx w="456"/><wx w="549"/><wx w="614"/><wx w="272"/><wx w="413"/><wx w="615"/><wx w="626"/><wx w="272"/><wx w="521"/><wx w="490"/><wx w="496"/><wx w="610"/><wx w="629"/><wx w="272"/><wx w="385"/><wx w="613"/><wx w="543"/><wx w="593"/><wx w="586"/><wx w="499"/><wx w="511"/><wx w="572"/><wx w="521"/><wx w="714"/><wx w="673"/><wx w="545"/><wx w="545"/><wx w="545"/><wx w="276"/><wx w="504"/><wx w="817"/><wx w="272"/><wx w="521"/><wx w="521"/><wx w="496"/><wx w="496"/><wx w="559"/><wx w="714"/><wx w="714"/><wx w="714"/><wx w="714"/><wx w="582"/><wx w="582"/><wx w="582"/><wx w="575"/><wx w="454"/><wx w="549"/><wx w="614"/><wx w="322"/><wx w="437"/><wx w="626"/><wx w="322"/><wx w="521"/><wx w="490"/><wx w="496"/><wx w="629"/><wx w="385"/><wx w="613"/><wx w="593"/><wx w="586"/><wx w="511"/><wx w="572"/><wx w="521"/><wx w="714"/><wx w="673"/><wx w="272"/><wx w="575"/><wx w="490"/><wx w="586"/><wx w="606"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="318"/><wx w="318"/><wx w="356"/><wx w="468"/><wx w="198"/><wx w="201"/><wx w="236"/><wx w="201"/><wx w="201"/><wx w="209"/><wx w="201"/><wx w="211"/><wx w="164"/><wx w="561"/><wx w="561"/><wx w="561"/><wx w="561"/><wx w="561"/><wx w="561"/><wx w="561"/><wx w="561"/><wx w="561"/><wx w="561"/><wx w="525"/><wx w="318"/><wx w="525"/><wx w="750"/><wx w="750"/><wx w="342"/><wx w="750"/><wx w="561"/><wx w="561"/><wx w="561"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="211"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="612"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="649"/><wx w="649"/><wx w="271"/><wx w="271"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="577"/><wx w="558"/><wx w="523"/><wx w="523"/><wx w="432"/><wx w="432"/><wx w="756"/><wx w="878"/><wx w="360"/><wx w="541"/><wx w="756"/><wx w="878"/><wx w="360"/><wx w="541"/><wx w="644"/><wx w="554"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="226"/><wx w="211"/><wx w="211"/><wx w="211"/><wx w="211"/><wx w="750"/><wx w="750"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="556"/><wx w="1000"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="318"/><wx w="318"/><wx w="750"/><wx w="703"/><wx w="468"/><wx w="238"/><wx w="253"/><wx w="216"/><wx w="234"/><wx w="451"/><wx w="451"/><wx w="216"/><wx w="234"/><wx w="644"/><wx w="577"/><wx w="271"/><wx w="271"/><wx w="216"/><wx w="234"/><wx w="649"/><wx w="649"/><wx w="271"/><wx w="271"/><wx w="342"/><wx w="415"/><wx w="649"/><wx w="649"/><wx w="271"/><wx w="271"/><wx w="649"/><wx w="649"/><wx w="271"/><wx w="271"/><wx w="577"/><wx w="558"/><wx w="523"/><wx w="523"/><wx w="577"/><wx w="558"/><wx w="523"/><wx w="523"/><wx w="577"/><wx w="558"/><wx w="523"/><wx w="523"/><wx w="342"/><wx w="342"/><wx w="342"/><wx w="342"/><wx w="432"/><wx w="432"/><wx w="432"/><wx w="432"/><wx w="899"/><wx w="899"/><wx w="608"/><wx w="608"/><wx w="899"/><wx w="899"/><wx w="608"/><wx w="608"/><wx w="1062"/><wx w="1062"/><wx w="771"/><wx w="771"/><wx w="1062"/><wx w="1062"/><wx w="771"/><wx w="771"/><wx w="523"/><wx w="523"/><wx w="523"/><wx w="523"/><wx w="523"/><wx w="523"/><wx w="523"/><wx w="523"/><wx w="541"/><wx w="468"/><wx w="541"/><wx w="360"/><wx w="541"/><wx w="468"/><wx w="541"/><wx w="360"/><wx w="757"/><wx w="757"/><wx w="304"/><wx w="324"/><wx w="612"/><wx w="612"/><wx w="304"/><wx w="324"/><wx w="541"/><wx w="541"/><wx w="360"/><wx w="360"/><wx w="451"/><wx w="451"/><wx w="234"/><wx w="234"/><wx w="360"/><wx w="360"/><wx w="415"/><wx w="415"/><wx w="541"/><wx w="541"/><wx w="271"/><wx w="271"/><wx w="342"/><wx w="415"/><wx w="468"/><wx w="451"/><wx w="451"/><wx w="451"/><wx w="644"/><wx w="554"/><wx w="644"/><wx w="577"/><wx w="271"/><wx w="271"/><wx w="541"/><wx w="595"/><wx w="486"/><wx w="541"/><wx w="486"/><wx w="541"/><wx w="486"/><wx w="541"/><wx w="750"/><wx w="750"/><wx w="201"/><wx w="201"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="164"/><wx w="211"/><wx w="750"/><wx w="750"/><wx w="209"/><wx w="236"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="211"/><wx w="211"/><wx w="211"/><wx w="211"/><wx w="211"/><wx w="226"/><wx w="750"/><wx w="201"/><wx w="201"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="318"/><wx w="318"/><wx w="318"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="750"/><wx w="125"/><wx w="1000"/><wx w="2000"/><wx w="853"/><wx w="710"/><wx w="829"/><wx w="724"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="513"/><wx w="833"/><wx w="833"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="277"/><wx w="722"/><wx w="556"/><wx w="722"/><wx w="556"/><wx w="722"/><wx w="556"/><wx w="722"/><wx w="556"/><wx w="722"/><wx w="556"/><wx w="722"/><wx w="556"/><wx w="722"/><wx w="556"/><wx w="722"/><wx w="556"/><wx w="722"/><wx w="556"/><wx w="722"/><wx w="556"/><wx w="722"/><wx w="556"/><wx w="722"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="277"/><wx w="277"/><wx w="277"/><wx w="277"/><wx w="777"/><wx w="610"/><wx w="777"/><wx w="610"/><wx w="777"/><wx w="610"/><wx w="777"/><wx w="610"/><wx w="777"/><wx w="610"/><wx w="777"/><wx w="610"/><wx w="777"/><wx w="610"/><wx w="853"/><wx w="710"/><wx w="853"/><wx w="710"/><wx w="853"/><wx w="710"/><wx w="853"/><wx w="710"/><wx w="853"/><wx w="710"/><wx w="722"/><wx w="610"/><wx w="722"/><wx w="610"/><wx w="829"/><wx w="724"/><wx w="829"/><wx w="724"/><wx w="829"/><wx w="724"/><wx w="829"/><wx w="724"/><wx w="829"/><wx w="724"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="722"/><wx w="556"/><wx w="277"/><wx w="277"/><wx w="777"/><wx w="610"/><wx w="722"/><wx w="610"/><wx w="722"/><wx w="610"/><wx w="722"/><wx w="610"/><wx w="722"/><wx w="610"/><wx w="722"/><wx w="610"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/></cid-widths></multibyte-extras><kerning kpx1="972"><pair kern="-27" kpx2="960"/><pair kern="-36" kpx2="967"/><pair kern="-27" kpx2="964"/></kerning><kerning kpx1="1088"><pair kern="-13" kpx2="1103"/><pair kern="-13" kpx2="1093"/><pair kern="-13" kpx2="1101"/><pair kern="-13" kpx2="1079"/><pair kern="-13" kpx2="1091"/><pair kern="-13" kpx2="1084"/><pair kern="-24" kpx2="1076"/><pair kern="-24" kpx2="1095"/><pair kern="-13" kpx2="1078"/><pair kern="-13" kpx2="1090"/><pair kern="-24" kpx2="1083"/></kerning><kerning kpx1="908"><pair kern="-27" kpx2="933"/><pair kern="-27" kpx2="939"/></kerning><kerning kpx1="960"><pair kern="-27" kpx2="940"/><pair kern="-37" kpx2="955"/><pair kern="-27" kpx2="950"/><pair kern="-27" kpx2="948"/><pair kern="-27" kpx2="974"/><pair kern="-27" kpx2="963"/><pair kern="-27" kpx2="966"/><pair kern="-27" kpx2="969"/><pair kern="-27" kpx2="959"/><pair kern="-27" kpx2="945"/><pair kern="-27" kpx2="962"/></kerning><kerning kpx1="927"><pair kern="-26" kpx2="923"/><pair kern="-27" kpx2="933"/><pair kern="-26" kpx2="916"/><pair kern="-27" kpx2="939"/><pair kern="-26" kpx2="913"/></kerning><kerning kpx1="86"><pair kern="-74" kpx2="111"/><pair kern="-55" kpx2="58"/><pair kern="-55" kpx2="114"/><pair kern="-91" kpx2="44"/><pair kern="-18" kpx2="105"/><pair kern="-55" kpx2="173"/><pair kern="-74" kpx2="65"/><pair kern="-55" kpx2="97"/><pair kern="-55" kpx2="894"/><pair kern="-37" kpx2="117"/><pair kern="-37" kpx2="121"/><pair kern="-91" kpx2="46"/><pair kern="-55" kpx2="101"/></kerning><kerning kpx1="958"><pair kern="-12" kpx2="972"/><pair kern="-12" kpx2="940"/><pair kern="-12" kpx2="950"/><pair kern="-12" kpx2="948"/><pair kern="-12" kpx2="963"/><pair kern="-12" kpx2="966"/><pair kern="-12" kpx2="959"/><pair kern="-12" kpx2="945"/><pair kern="-12" kpx2="962"/><pair kern="-12" kpx2="958"/></kerning><kerning kpx1="118"><pair kern="-74" kpx2="46"/><pair kern="-74" kpx2="44"/></kerning><kerning kpx1="1086"><pair kern="-13" kpx2="1103"/><pair kern="-24" kpx2="1093"/><pair kern="-13" kpx2="1089"/><pair kern="-13" kpx2="1101"/><pair kern="-13" kpx2="1079"/><pair kern="-13" kpx2="1091"/><pair kern="-13" kpx2="1084"/><pair kern="-13" kpx2="1076"/><pair kern="-24" kpx2="1095"/><pair kern="-13" kpx2="1078"/><pair kern="-24" kpx2="1090"/><pair kern="-24" kpx2="1083"/></kerning><kerning kpx1="1050"><pair kern="12" kpx2="1069"/><pair kern="-13" kpx2="1060"/><pair kern="-13" kpx2="1089"/><pair kern="12" kpx2="1079"/><pair kern="-13" kpx2="1057"/><pair kern="37" kpx2="1047"/><pair kern="12" kpx2="1072"/><pair kern="24" kpx2="1059"/><pair kern="24" kpx2="1063"/><pair kern="24" kpx2="1058"/></kerning><kerning kpx1="1060"><pair kern="-25" kpx2="1071"/><pair kern="-13" kpx2="1060"/><pair kern="-38" kpx2="1051"/><pair kern="-24" kpx2="1040"/><pair kern="-38" kpx2="1059"/><pair kern="-50" kpx2="1044"/><pair kern="-13" kpx2="1063"/><pair kern="-38" kpx2="1058"/><pair kern="-24" kpx2="1083"/></kerning><kerning kpx1="160"><pair kern="-37" kpx2="923"/><pair kern="-18" kpx2="933"/><pair kern="-37" kpx2="916"/><pair kern="-37" kpx2="65"/><pair kern="-18" kpx2="89"/><pair kern="-18" kpx2="939"/><pair kern="-37" kpx2="902"/><pair kern="-37" kpx2="913"/></kerning><kerning kpx1="1047"><pair kern="-24" kpx2="1071"/><pair kern="-13" kpx2="1054"/><pair kern="-24" kpx2="1060"/><pair kern="-24" kpx2="1057"/><pair kern="-24" kpx2="1051"/><pair kern="-38" kpx2="1059"/><pair kern="-24" kpx2="1046"/><pair kern="-38" kpx2="1063"/><pair kern="-38" kpx2="1058"/></kerning><kerning kpx1="1057"><pair kern="-13" kpx2="1069"/><pair kern="-13" kpx2="1052"/><pair kern="-13" kpx2="1044"/><pair kern="-13" kpx2="1066"/><pair kern="-38" kpx2="1061"/><pair kern="-13" kpx2="1092"/><pair kern="-24" kpx2="1058"/><pair kern="-24" kpx2="1054"/><pair kern="-13" kpx2="1089"/><pair kern="-13" kpx2="1047"/><pair kern="12" kpx2="1072"/><pair kern="-24" kpx2="1040"/><pair kern="-24" kpx2="1051"/><pair kern="-13" kpx2="1059"/><pair kern="-13" kpx2="1095"/><pair kern="12" kpx2="1078"/><pair kern="-24" kpx2="1063"/><pair kern="-13" kpx2="1073"/></kerning><kerning kpx1="937"><pair kern="-27" kpx2="933"/><pair kern="-27" kpx2="939"/></kerning><kerning kpx1="913"><pair kern="-37" kpx2="967"/><pair kern="-90" kpx2="933"/><pair kern="-37" kpx2="957"/><pair kern="-26" kpx2="920"/><pair kern="-90" kpx2="939"/><pair kern="-26" kpx2="927"/><pair kern="-26" kpx2="934"/><pair kern="-83" kpx2="932"/><pair kern="-37" kpx2="947"/><pair kern="-55" kpx2="8217"/></kerning><kerning kpx1="82"><pair kern="-18" kpx2="87"/><pair kern="-37" kpx2="89"/><pair kern="-18" kpx2="86"/></kerning><kerning kpx1="119"><pair kern="-37" kpx2="46"/><pair kern="-37" kpx2="44"/></kerning><kerning kpx1="1101"><pair kern="-13" kpx2="1103"/><pair kern="-13" kpx2="1093"/><pair kern="-13" kpx2="1089"/><pair kern="-13" kpx2="1079"/><pair kern="-13" kpx2="1084"/><pair kern="-13" kpx2="1076"/><pair kern="-13" kpx2="1078"/><pair kern="-13" kpx2="1090"/><pair kern="-13" kpx2="1073"/><pair kern="-24" kpx2="1083"/></kerning><kerning kpx1="1084"><pair kern="-13" kpx2="1086"/><pair kern="-13" kpx2="1089"/><pair kern="-13" kpx2="1101"/><pair kern="-13" kpx2="1079"/><pair kern="-13" kpx2="1091"/><pair kern="-13" kpx2="1072"/><pair kern="-13" kpx2="1092"/><pair kern="-13" kpx2="1073"/></kerning><kerning kpx1="1052"><pair kern="-13" kpx2="1089"/><pair kern="12" kpx2="1072"/><pair kern="-13" kpx2="1095"/></kerning><kerning kpx1="939"><pair kern="-74" kpx2="972"/><pair kern="-90" kpx2="923"/><pair kern="-74" kpx2="940"/><pair kern="-74" kpx2="963"/><pair kern="-37" kpx2="951"/><pair kern="-37" kpx2="954"/><pair kern="-38" kpx2="927"/><pair kern="-74" kpx2="959"/><pair kern="125" kpx2="912"/><pair kern="-37" kpx2="943"/><pair kern="-37" kpx2="953"/><pair kern="44" kpx2="970"/><pair kern="-37" kpx2="948"/><pair kern="-90" kpx2="916"/><pair kern="-37" kpx2="942"/><pair kern="-38" kpx2="920"/><pair kern="-37" kpx2="956"/><pair kern="-74" kpx2="966"/><pair kern="-38" kpx2="937"/><pair kern="-38" kpx2="934"/><pair kern="-74" kpx2="945"/><pair kern="-90" kpx2="913"/></kerning><kerning kpx1="959"><pair kern="-27" kpx2="960"/><pair kern="-36" kpx2="967"/><pair kern="-27" kpx2="964"/></kerning><kerning kpx1="915"><pair kern="-108" kpx2="923"/><pair kern="-32" kpx2="953"/><pair kern="45" kpx2="970"/><pair kern="-108" kpx2="916"/><pair kern="-109" kpx2="46"/><pair kern="-32" kpx2="943"/><pair kern="-108" kpx2="913"/><pair kern="-109" kpx2="44"/></kerning><kerning kpx1="1058"><pair kern="-38" kpx2="1088"/><pair kern="-13" kpx2="1097"/><pair kern="-49" kpx2="1077"/><pair kern="-24" kpx2="171"/><pair kern="-38" kpx2="1080"/><pair kern="-62" kpx2="1086"/><pair kern="-13" kpx2="1099"/><pair kern="-38" kpx2="1060"/><pair kern="-62" kpx2="1089"/><pair kern="-38" kpx2="1091"/><pair kern="-62" kpx2="1040"/><pair kern="-13" kpx2="1087"/><pair kern="-38" kpx2="1093"/><pair kern="-13" kpx2="58"/><pair kern="-50" kpx2="1084"/><pair kern="-13" kpx2="1102"/><pair kern="-24" kpx2="1044"/><pair kern="-100" kpx2="44"/><pair kern="-24" kpx2="1103"/><pair kern="-13" kpx2="1071"/><pair kern="-24" kpx2="1054"/><pair kern="-38" kpx2="1082"/><pair kern="-13" kpx2="894"/><pair kern="-38" kpx2="1074"/><pair kern="-24" kpx2="1072"/><pair kern="-24" kpx2="1051"/><pair kern="-13" kpx2="1100"/><pair kern="-112" kpx2="46"/><pair kern="24" kpx2="1046"/><pair kern="-62" kpx2="1083"/></kerning><kerning kpx1="920"><pair kern="-26" kpx2="923"/><pair kern="-27" kpx2="933"/><pair kern="-26" kpx2="916"/><pair kern="-27" kpx2="939"/><pair kern="-26" kpx2="913"/></kerning><kerning kpx1="121"><pair kern="-74" kpx2="46"/><pair kern="-74" kpx2="44"/></kerning><kerning kpx1="1051"><pair kern="24" kpx2="1072"/></kerning><kerning kpx1="1046"><pair kern="-13" kpx2="1086"/><pair kern="-13" kpx2="1054"/><pair kern="-24" kpx2="1057"/><pair kern="12" kpx2="1047"/><pair kern="12" kpx2="1072"/><pair kern="37" kpx2="1066"/><pair kern="24" kpx2="1059"/><pair kern="12" kpx2="1063"/><pair kern="24" kpx2="1058"/></kerning><kerning kpx1="1041"><pair kern="-24" kpx2="1069"/><pair kern="-38" kpx2="1066"/><pair kern="-24" kpx2="1061"/><pair kern="-24" kpx2="1058"/><pair kern="-24" kpx2="1071"/><pair kern="-13" kpx2="1060"/><pair kern="-13" kpx2="1091"/><pair kern="-13" kpx2="1047"/><pair kern="-13" kpx2="1057"/><pair kern="-38" kpx2="1040"/><pair kern="-24" kpx2="1051"/><pair kern="-24" kpx2="1059"/><pair kern="-24" kpx2="1046"/><pair kern="-38" kpx2="1063"/></kerning><kerning kpx1="1083"><pair kern="-13" kpx2="1086"/><pair kern="-13" kpx2="1089"/><pair kern="-13" kpx2="1077"/><pair kern="-13" kpx2="1091"/><pair kern="-24" kpx2="1095"/><pair kern="-13" kpx2="1073"/></kerning><kerning kpx1="1097"><pair kern="-13" kpx2="1086"/><pair kern="12" kpx2="1072"/></kerning><kerning kpx1="950"><pair kern="-56" kpx2="972"/><pair kern="-56" kpx2="940"/><pair kern="-37" kpx2="960"/><pair kern="-56" kpx2="963"/><pair kern="-23" kpx2="951"/><pair kern="-23" kpx2="954"/><pair kern="-56" kpx2="959"/><pair kern="-37" kpx2="964"/><pair kern="-32" kpx2="947"/><pair kern="-23" kpx2="953"/><pair kern="-37" kpx2="948"/><pair kern="-56" kpx2="974"/><pair kern="-37" kpx2="952"/><pair kern="-32" kpx2="957"/><pair kern="-23" kpx2="942"/><pair kern="-56" kpx2="966"/><pair kern="-56" kpx2="969"/><pair kern="-56" kpx2="945"/></kerning><kerning kpx1="929"><pair kern="-74" kpx2="923"/><pair kern="-74" kpx2="916"/><pair kern="-127" kpx2="46"/><pair kern="-74" kpx2="913"/><pair kern="-127" kpx2="44"/></kerning><kerning kpx1="87"><pair kern="-18" kpx2="111"/><pair kern="-18" kpx2="58"/><pair kern="-18" kpx2="114"/><pair kern="-55" kpx2="44"/><pair kern="-8" kpx2="105"/><pair kern="-20" kpx2="173"/><pair kern="-55" kpx2="65"/><pair kern="-37" kpx2="97"/><pair kern="-18" kpx2="894"/><pair kern="-18" kpx2="117"/><pair kern="-18" kpx2="121"/><pair kern="-55" kpx2="46"/><pair kern="-18" kpx2="101"/></kerning><kerning kpx1="932"><pair kern="-74" kpx2="972"/><pair kern="-74" kpx2="940"/><pair kern="-74" kpx2="963"/><pair kern="-74" kpx2="971"/><pair kern="-18" kpx2="927"/><pair kern="-74" kpx2="947"/><pair kern="-18" kpx2="953"/><pair kern="-80" kpx2="916"/><pair kern="-74" kpx2="966"/><pair kern="-18" kpx2="937"/><pair kern="-74" kpx2="945"/><pair kern="-74" kpx2="913"/><pair kern="-74" kpx2="923"/><pair kern="-60" kpx2="967"/><pair kern="-109" kpx2="58"/><pair kern="-74" kpx2="951"/><pair kern="-74" kpx2="968"/><pair kern="-74" kpx2="959"/><pair kern="118" kpx2="912"/><pair kern="-109" kpx2="44"/><pair kern="-74" kpx2="965"/><pair kern="-55" kpx2="173"/><pair kern="44" kpx2="970"/><pair kern="-41" kpx2="948"/><pair kern="-109" kpx2="894"/><pair kern="-74" kpx2="957"/><pair kern="-18" kpx2="920"/><pair kern="-74" kpx2="956"/><pair kern="-109" kpx2="46"/><pair kern="-74" kpx2="949"/><pair kern="-26" kpx2="934"/><pair kern="-74" kpx2="973"/><pair kern="-74" kpx2="941"/></kerning><kerning kpx1="964"><pair kern="-27" kpx2="940"/><pair kern="-27" kpx2="950"/><pair kern="-27" kpx2="948"/><pair kern="-27" kpx2="974"/><pair kern="-27" kpx2="963"/><pair kern="-27" kpx2="966"/><pair kern="-27" kpx2="969"/><pair kern="-27" kpx2="959"/><pair kern="-27" kpx2="945"/><pair kern="-27" kpx2="962"/></kerning><kerning kpx1="1061"><pair kern="-24" kpx2="1069"/><pair kern="-13" kpx2="1086"/><pair kern="-25" kpx2="1054"/><pair kern="-38" kpx2="1060"/><pair kern="-13" kpx2="1091"/><pair kern="-38" kpx2="1057"/><pair kern="-13" kpx2="1047"/></kerning><kerning kpx1="65"><pair kern="-18" kpx2="119"/><pair kern="-55" kpx2="87"/><pair kern="-37" kpx2="160"/><pair kern="-91" kpx2="89"/><pair kern="-37" kpx2="121"/><pair kern="-74" kpx2="84"/><pair kern="-74" kpx2="86"/><pair kern="-55" kpx2="8217"/><pair kern="-37" kpx2="118"/></kerning><kerning kpx1="974"><pair kern="-27" kpx2="960"/><pair kern="-20" kpx2="967"/><pair kern="-27" kpx2="964"/></kerning><kerning kpx1="1027"><pair kern="-13" kpx2="58"/><pair kern="-38" kpx2="171"/><pair kern="-13" kpx2="894"/><pair kern="-125" kpx2="46"/><pair kern="-38" kpx2="187"/><pair kern="-112" kpx2="44"/></kerning><kerning kpx1="1079"><pair kern="-13" kpx2="1077"/><pair kern="-24" kpx2="1084"/><pair kern="-24" kpx2="1098"/><pair kern="-13" kpx2="1092"/><pair kern="-24" kpx2="1086"/><pair kern="-24" kpx2="1089"/><pair kern="-13" kpx2="1079"/><pair kern="-24" kpx2="1091"/><pair kern="-13" kpx2="1072"/><pair kern="-38" kpx2="1095"/><pair kern="-13" kpx2="1078"/><pair kern="-24" kpx2="1073"/><pair kern="-13" kpx2="1083"/></kerning><kerning kpx1="1091"><pair kern="-13" kpx2="1088"/><pair kern="12" kpx2="1093"/><pair kern="-13" kpx2="58"/><pair kern="-13" kpx2="1077"/><pair kern="-13" kpx2="1101"/><pair kern="-13" kpx2="1084"/><pair kern="-24" kpx2="1076"/><pair kern="24" kpx2="187"/><pair kern="-13" kpx2="1092"/><pair kern="12" kpx2="1090"/><pair kern="-75" kpx2="44"/><pair kern="-13" kpx2="1103"/><pair kern="-24" kpx2="1086"/><pair kern="-24" kpx2="1089"/><pair kern="-13" kpx2="1079"/><pair kern="-13" kpx2="894"/><pair kern="-13" kpx2="1072"/><pair kern="-87" kpx2="46"/><pair kern="12" kpx2="1078"/><pair kern="-13" kpx2="1083"/></kerning><kerning kpx1="1040"><pair kern="-24" kpx2="1069"/><pair kern="12" kpx2="1101"/><pair kern="37" kpx2="1044"/><pair kern="-13" kpx2="1090"/><pair kern="-49" kpx2="1058"/><pair kern="-50" kpx2="8217"/><pair kern="-13" kpx2="1054"/><pair kern="-24" kpx2="1060"/><pair kern="-13" kpx2="1089"/><pair kern="-24" kpx2="1057"/><pair kern="12" kpx2="1072"/><pair kern="12" kpx2="1051"/><pair kern="-13" kpx2="1055"/><pair kern="-38" kpx2="1059"/><pair kern="-76" kpx2="1063"/><pair kern="-13" kpx2="1073"/></kerning><kerning kpx1="969"><pair kern="-27" kpx2="960"/><pair kern="-20" kpx2="967"/><pair kern="-27" kpx2="964"/></kerning><kerning kpx1="1059"><pair kern="-38" kpx2="1088"/><pair kern="-13" kpx2="1069"/><pair kern="-38" kpx2="1097"/><pair kern="-62" kpx2="1077"/><pair kern="-38" kpx2="171"/><pair kern="-38" kpx2="1085"/><pair kern="-38" kpx2="1080"/><pair kern="-38" kpx2="187"/><pair kern="-62" kpx2="1086"/><pair kern="-38" kpx2="1060"/><pair kern="-38" kpx2="1096"/><pair kern="-62" kpx2="1089"/><pair kern="-49" kpx2="1079"/><pair kern="-75" kpx2="1040"/><pair kern="-38" kpx2="1087"/><pair kern="-13" kpx2="1078"/><pair kern="-24" kpx2="1093"/><pair kern="-24" kpx2="58"/><pair kern="-49" kpx2="1084"/><pair kern="-38" kpx2="1094"/><pair kern="-62" kpx2="1076"/><pair kern="-38" kpx2="1081"/><pair kern="-38" kpx2="1102"/><pair kern="-50" kpx2="1044"/><pair kern="-112" kpx2="44"/><pair kern="-49" kpx2="1103"/><pair kern="-24" kpx2="1071"/><pair kern="-24" kpx2="1054"/><pair kern="-38" kpx2="1075"/><pair kern="-38" kpx2="1082"/><pair kern="-24" kpx2="894"/><pair kern="-38" kpx2="1074"/><pair kern="-38" kpx2="1051"/><pair kern="-125" kpx2="46"/><pair kern="-24" kpx2="1073"/><pair kern="-62" kpx2="1083"/></kerning><kerning kpx1="923"><pair kern="-90" kpx2="933"/><pair kern="-26" kpx2="920"/><pair kern="-90" kpx2="939"/><pair kern="-26" kpx2="927"/><pair kern="-83" kpx2="932"/></kerning><kerning kpx1="967"><pair kern="-36" kpx2="972"/><pair kern="-36" kpx2="940"/><pair kern="-36" kpx2="950"/><pair kern="-36" kpx2="948"/><pair kern="-20" kpx2="974"/><pair kern="-36" kpx2="963"/><pair kern="-36" kpx2="966"/><pair kern="-20" kpx2="969"/><pair kern="-36" kpx2="959"/><pair kern="-36" kpx2="945"/><pair kern="-36" kpx2="962"/></kerning><kerning kpx1="961"><pair kern="-27" kpx2="960"/><pair kern="-27" kpx2="964"/></kerning><kerning kpx1="114"><pair kern="-55" kpx2="46"/><pair kern="37" kpx2="8217"/><pair kern="-55" kpx2="44"/></kerning><kerning kpx1="1062"><pair kern="12" kpx2="1086"/><pair kern="12" kpx2="1077"/><pair kern="37" kpx2="1072"/></kerning><kerning kpx1="931"><pair kern="-17" kpx2="960"/><pair kern="-17" kpx2="964"/></kerning><kerning kpx1="954"><pair kern="-33" kpx2="940"/><pair kern="-33" kpx2="972"/><pair kern="-33" kpx2="950"/><pair kern="-33" kpx2="963"/><pair kern="-33" kpx2="959"/><pair kern="-33" kpx2="958"/><pair kern="-33" kpx2="948"/><pair kern="-33" kpx2="974"/><pair kern="-14" kpx2="952"/><pair kern="-33" kpx2="966"/><pair kern="-33" kpx2="969"/><pair kern="-33" kpx2="945"/><pair kern="-33" kpx2="962"/></kerning><kerning kpx1="922"><pair kern="-22" kpx2="972"/><pair kern="-22" kpx2="940"/><pair kern="-22" kpx2="950"/><pair kern="-22" kpx2="963"/><pair kern="-45" kpx2="927"/><pair kern="-22" kpx2="959"/><pair kern="-22" kpx2="958"/><pair kern="-22" kpx2="948"/><pair kern="-22" kpx2="974"/><pair kern="-22" kpx2="952"/><pair kern="-45" kpx2="920"/><pair kern="-22" kpx2="966"/><pair kern="-22" kpx2="969"/><pair kern="-45" kpx2="934"/><pair kern="-22" kpx2="945"/></kerning><kerning kpx1="76"><pair kern="-55" kpx2="87"/><pair kern="-18" kpx2="160"/><pair kern="-91" kpx2="89"/><pair kern="-37" kpx2="121"/><pair kern="-74" kpx2="84"/><pair kern="-74" kpx2="86"/><pair kern="-55" kpx2="8217"/></kerning><kerning kpx1="936"><pair kern="-18" kpx2="972"/><pair kern="-18" kpx2="940"/><pair kern="-18" kpx2="948"/><pair kern="-18" kpx2="974"/><pair kern="-18" kpx2="963"/><pair kern="-18" kpx2="966"/><pair kern="-18" kpx2="969"/><pair kern="-18" kpx2="959"/><pair kern="-18" kpx2="945"/></kerning><kerning kpx1="1090"><pair kern="-13" kpx2="1086"/><pair kern="-13" kpx2="1089"/><pair kern="24" kpx2="1091"/><pair kern="-13" kpx2="1076"/><pair kern="-87" kpx2="46"/><pair kern="12" kpx2="1078"/><pair kern="-13" kpx2="1083"/><pair kern="-75" kpx2="44"/></kerning><kerning kpx1="1082"><pair kern="-13" kpx2="1086"/><pair kern="-13" kpx2="1089"/><pair kern="-13" kpx2="1101"/><pair kern="-13" kpx2="1095"/><pair kern="-13" kpx2="1092"/><pair kern="12" kpx2="1083"/></kerning><kerning kpx1="1118"><pair kern="-13" kpx2="58"/><pair kern="-24" kpx2="171"/><pair kern="-13" kpx2="894"/><pair kern="-87" kpx2="46"/><pair kern="-75" kpx2="44"/></kerning><kerning kpx1="1072"><pair kern="12" kpx2="1079"/><pair kern="-24" kpx2="1095"/></kerning><kerning kpx1="1100"><pair kern="-87" kpx2="1095"/><pair kern="-87" kpx2="1090"/></kerning><kerning kpx1="935"><pair kern="-13" kpx2="974"/><pair kern="-13" kpx2="969"/></kerning><kerning kpx1="1069"><pair kern="-24" kpx2="1071"/><pair kern="-13" kpx2="1060"/><pair kern="-13" kpx2="1047"/><pair kern="-38" kpx2="1051"/><pair kern="-13" kpx2="1076"/><pair kern="-24" kpx2="1044"/><pair kern="-24" kpx2="1061"/><pair kern="-24" kpx2="1046"/><pair kern="12" kpx2="1078"/><pair kern="-24" kpx2="1083"/></kerning><kerning kpx1="955"><pair kern="-12" kpx2="972"/><pair kern="-12" kpx2="940"/><pair kern="-12" kpx2="950"/><pair kern="-12" kpx2="963"/><pair kern="-15" kpx2="971"/><pair kern="-15" kpx2="944"/><pair kern="-12" kpx2="959"/><pair kern="-12" kpx2="958"/><pair kern="-15" kpx2="965"/><pair kern="-12" kpx2="948"/><pair kern="-12" kpx2="974"/><pair kern="-12" kpx2="966"/><pair kern="-12" kpx2="969"/><pair kern="-15" kpx2="973"/><pair kern="-12" kpx2="945"/><pair kern="-12" kpx2="962"/></kerning><kerning kpx1="1033"><pair kern="-100" kpx2="8217"/></kerning><kerning kpx1="1034"><pair kern="-100" kpx2="8217"/></kerning><kerning kpx1="80"><pair kern="-74" kpx2="65"/><pair kern="-18" kpx2="160"/><pair kern="-128" kpx2="46"/><pair kern="-128" kpx2="44"/></kerning><kerning kpx1="8222"><pair kern="-100" kpx2="1035"/><pair kern="-100" kpx2="1026"/><pair kern="-87" kpx2="1066"/><pair kern="-101" kpx2="1063"/><pair kern="-87" kpx2="1058"/></kerning><kerning kpx1="1089"><pair kern="-13" kpx2="1093"/><pair kern="12" kpx2="1072"/><pair kern="-13" kpx2="1098"/><pair kern="-25" kpx2="1095"/><pair kern="-13" kpx2="1073"/></kerning><kerning kpx1="910"><pair kern="-74" kpx2="972"/><pair kern="-90" kpx2="923"/><pair kern="-74" kpx2="940"/><pair kern="-74" kpx2="963"/><pair kern="-37" kpx2="951"/><pair kern="-37" kpx2="954"/><pair kern="-38" kpx2="927"/><pair kern="-74" kpx2="959"/><pair kern="125" kpx2="912"/><pair kern="-37" kpx2="943"/><pair kern="-37" kpx2="953"/><pair kern="44" kpx2="970"/><pair kern="-37" kpx2="948"/><pair kern="-90" kpx2="916"/><pair kern="-37" kpx2="942"/><pair kern="-38" kpx2="920"/><pair kern="-37" kpx2="956"/><pair kern="-74" kpx2="966"/><pair kern="-38" kpx2="937"/><pair kern="-38" kpx2="934"/><pair kern="-74" kpx2="945"/><pair kern="-90" kpx2="913"/></kerning><kerning kpx1="70"><pair kern="-55" kpx2="65"/><pair kern="-110" kpx2="46"/><pair kern="-110" kpx2="44"/></kerning><kerning kpx1="966"><pair kern="-27" kpx2="960"/><pair kern="-12" kpx2="955"/><pair kern="-36" kpx2="967"/><pair kern="-27" kpx2="964"/></kerning><kerning kpx1="1094"><pair kern="-13" kpx2="1089"/><pair kern="12" kpx2="1079"/><pair kern="12" kpx2="1072"/></kerning><kerning kpx1="8216"><pair kern="-37" kpx2="8216"/></kerning><kerning kpx1="1070"><pair kern="-13" kpx2="1057"/><pair kern="-38" kpx2="1051"/><pair kern="-24" kpx2="1040"/><pair kern="-24" kpx2="1076"/><pair kern="-24" kpx2="1044"/><pair kern="-38" kpx2="1061"/><pair kern="-24" kpx2="1046"/><pair kern="12" kpx2="1078"/><pair kern="-13" kpx2="1063"/><pair kern="-24" kpx2="1058"/><pair kern="-24" kpx2="1083"/></kerning><kerning kpx1="1092"><pair kern="-13" kpx2="1103"/><pair kern="-13" kpx2="1086"/><pair kern="-13" kpx2="1077"/><pair kern="-13" kpx2="1091"/><pair kern="-13" kpx2="1084"/><pair kern="-13" kpx2="1076"/><pair kern="-24" kpx2="1095"/><pair kern="-13" kpx2="1090"/><pair kern="-13" kpx2="1073"/><pair kern="-24" kpx2="1083"/></kerning><kerning kpx1="933"><pair kern="-74" kpx2="972"/><pair kern="-74" kpx2="940"/><pair kern="-74" kpx2="963"/><pair kern="-38" kpx2="927"/><pair kern="-37" kpx2="943"/><pair kern="-41" kpx2="947"/><pair kern="-37" kpx2="953"/><pair kern="-90" kpx2="916"/><pair kern="-74" kpx2="966"/><pair kern="-38" kpx2="937"/><pair kern="-90" kpx2="913"/><pair kern="-74" kpx2="945"/><pair kern="-90" kpx2="923"/><pair kern="-74" kpx2="58"/><pair kern="-37" kpx2="951"/><pair kern="-37" kpx2="954"/><pair kern="-74" kpx2="959"/><pair kern="125" kpx2="912"/><pair kern="-109" kpx2="44"/><pair kern="-55" kpx2="173"/><pair kern="44" kpx2="970"/><pair kern="-37" kpx2="948"/><pair kern="-74" kpx2="894"/><pair kern="-38" kpx2="920"/><pair kern="-37" kpx2="942"/><pair kern="-37" kpx2="956"/><pair kern="-109" kpx2="46"/><pair kern="-38" kpx2="934"/></kerning><kerning kpx1="102"><pair kern="18" kpx2="8217"/></kerning><kerning kpx1="1074"><pair kern="-13" kpx2="1077"/><pair kern="-13" kpx2="1084"/><pair kern="-24" kpx2="1098"/><pair kern="-13" kpx2="1090"/><pair kern="-13" kpx2="1092"/><pair kern="-13" kpx2="1103"/><pair kern="-13" kpx2="1086"/><pair kern="-24" kpx2="1089"/><pair kern="-24" kpx2="1091"/><pair kern="-13" kpx2="1072"/><pair kern="-38" kpx2="1095"/><pair kern="-13" kpx2="1078"/><pair kern="-13" kpx2="1073"/><pair kern="-13" kpx2="1083"/></kerning><kerning kpx1="84"><pair kern="-74" kpx2="111"/><pair kern="-18" kpx2="79"/><pair kern="-74" kpx2="119"/><pair kern="-110" kpx2="58"/><pair kern="-55" kpx2="114"/><pair kern="-74" kpx2="99"/><pair kern="-110" kpx2="44"/><pair kern="-18" kpx2="105"/><pair kern="-55" kpx2="173"/><pair kern="-74" kpx2="65"/><pair kern="-74" kpx2="97"/><pair kern="-110" kpx2="894"/><pair kern="-74" kpx2="117"/><pair kern="-74" kpx2="121"/><pair kern="-110" kpx2="46"/><pair kern="-74" kpx2="115"/><pair kern="-74" kpx2="101"/></kerning><kerning kpx1="934"><pair kern="-27" kpx2="933"/><pair kern="-27" kpx2="939"/><pair kern="-26" kpx2="932"/><pair kern="-26" kpx2="913"/></kerning><kerning kpx1="1073"><pair kern="-13" kpx2="1103"/><pair kern="-24" kpx2="1093"/><pair kern="-13" kpx2="1089"/><pair kern="-13" kpx2="1101"/><pair kern="-13" kpx2="1079"/><pair kern="-13" kpx2="1091"/><pair kern="-13" kpx2="1084"/><pair kern="-13" kpx2="1098"/><pair kern="-24" kpx2="1076"/><pair kern="-24" kpx2="1095"/><pair kern="-13" kpx2="1078"/><pair kern="-24" kpx2="1083"/></kerning><kerning kpx1="1056"><pair kern="-24" kpx2="1077"/><pair kern="-13" kpx2="58"/><pair kern="-13" kpx2="1052"/><pair kern="-62" kpx2="1076"/><pair kern="-62" kpx2="1044"/><pair kern="-38" kpx2="1061"/><pair kern="-13" kpx2="1058"/><pair kern="-138" kpx2="44"/><pair kern="-13" kpx2="1103"/><pair kern="-24" kpx2="1086"/><pair kern="-24" kpx2="1071"/><pair kern="-13" kpx2="1054"/><pair kern="-13" kpx2="1060"/><pair kern="-13" kpx2="894"/><pair kern="-13" kpx2="1047"/><pair kern="-24" kpx2="1057"/><pair kern="-13" kpx2="1072"/><pair kern="-87" kpx2="1040"/><pair kern="-62" kpx2="1051"/><pair kern="-149" kpx2="46"/><pair kern="-13" kpx2="1059"/><pair kern="-13" kpx2="1046"/></kerning><kerning kpx1="1077"><pair kern="-13" kpx2="1093"/><pair kern="-13" kpx2="1089"/><pair kern="-13" kpx2="1091"/><pair kern="-13" kpx2="1084"/><pair kern="-24" kpx2="1095"/><pair kern="-13" kpx2="1078"/><pair kern="-13" kpx2="1090"/><pair kern="-13" kpx2="1073"/></kerning><kerning kpx1="1066"><pair kern="-38" kpx2="1071"/><pair kern="-100" kpx2="8217"/></kerning><kerning kpx1="49"><pair kern="-55" kpx2="49"/></kerning><kerning kpx1="916"><pair kern="-90" kpx2="933"/><pair kern="-26" kpx2="920"/><pair kern="-90" kpx2="939"/><pair kern="-26" kpx2="927"/><pair kern="-83" kpx2="932"/></kerning><kerning kpx1="1042"><pair kern="-13" kpx2="1093"/><pair kern="-13" kpx2="1044"/><pair kern="-49" kpx2="1066"/><pair kern="-38" kpx2="1061"/><pair kern="-13" kpx2="1090"/><pair kern="-38" kpx2="1058"/><pair kern="-24" kpx2="1071"/><pair kern="-24" kpx2="1054"/><pair kern="-24" kpx2="1060"/><pair kern="-13" kpx2="1047"/><pair kern="-38" kpx2="1057"/><pair kern="-49" kpx2="1040"/><pair kern="-24" kpx2="1051"/><pair kern="-38" kpx2="1059"/><pair kern="-38" kpx2="1095"/><pair kern="-38" kpx2="1046"/><pair kern="-38" kpx2="1063"/></kerning><kerning kpx1="902"><pair kern="-37" kpx2="967"/><pair kern="-90" kpx2="933"/><pair kern="-37" kpx2="957"/><pair kern="-26" kpx2="920"/><pair kern="-90" kpx2="939"/><pair kern="-26" kpx2="927"/><pair kern="-26" kpx2="934"/><pair kern="-83" kpx2="932"/><pair kern="-37" kpx2="947"/></kerning><kerning kpx1="1078"><pair kern="-24" kpx2="1086"/><pair kern="-13" kpx2="1089"/><pair kern="-13" kpx2="1077"/><pair kern="12" kpx2="1079"/><pair kern="12" kpx2="1072"/><pair kern="-24" kpx2="1095"/></kerning><kerning kpx1="1068"><pair kern="-38" kpx2="1069"/><pair kern="-24" kpx2="1052"/><pair kern="-13" kpx2="1044"/><pair kern="-50" kpx2="1061"/><pair kern="-101" kpx2="1058"/><pair kern="-75" kpx2="8217"/><pair kern="-38" kpx2="1071"/><pair kern="-13" kpx2="1054"/><pair kern="-24" kpx2="1047"/><pair kern="-24" kpx2="1057"/><pair kern="-24" kpx2="1040"/><pair kern="-38" kpx2="1051"/><pair kern="-38" kpx2="1046"/><pair kern="-75" kpx2="1063"/></kerning><kerning kpx1="1168"><pair kern="-13" kpx2="58"/><pair kern="-24" kpx2="171"/><pair kern="-13" kpx2="894"/><pair kern="-75" kpx2="46"/><pair kern="-24" kpx2="187"/><pair kern="-62" kpx2="44"/></kerning><kerning kpx1="1093"><pair kern="-24" kpx2="1086"/><pair kern="-24" kpx2="1089"/><pair kern="-24" kpx2="1077"/><pair kern="-13" kpx2="1101"/><pair kern="-13" kpx2="1079"/><pair kern="12" kpx2="1091"/><pair kern="-24" kpx2="1095"/><pair kern="-13" kpx2="1092"/><pair kern="-13" kpx2="1073"/></kerning><kerning kpx1="1065"><pair kern="12" kpx2="1072"/></kerning><kerning kpx1="1076"><pair kern="-13" kpx2="1089"/><pair kern="12" kpx2="1079"/><pair kern="12" kpx2="1091"/><pair kern="-13" kpx2="1098"/></kerning><kerning kpx1="1102"><pair kern="-24" kpx2="1093"/><pair kern="-13" kpx2="1089"/><pair kern="-13" kpx2="1101"/><pair kern="-13" kpx2="1084"/><pair kern="-13" kpx2="1076"/><pair kern="-38" kpx2="1095"/><pair kern="-13" kpx2="1078"/><pair kern="-24" kpx2="1090"/><pair kern="-13" kpx2="1073"/><pair kern="-24" kpx2="1083"/></kerning><kerning kpx1="1044"><pair kern="12" kpx2="1086"/><pair kern="-13" kpx2="1060"/><pair kern="12" kpx2="1077"/><pair kern="24" kpx2="1079"/><pair kern="12" kpx2="1091"/><pair kern="12" kpx2="1047"/><pair kern="12" kpx2="1059"/><pair kern="-13" kpx2="1063"/></kerning><kerning kpx1="1043"><pair kern="-38" kpx2="1088"/><pair kern="-50" kpx2="1077"/><pair kern="-38" kpx2="171"/><pair kern="-24" kpx2="1085"/><pair kern="-24" kpx2="1080"/><pair kern="-38" kpx2="187"/><pair kern="-49" kpx2="1086"/><pair kern="-38" kpx2="1099"/><pair kern="-38" kpx2="1091"/><pair kern="-13" kpx2="1057"/><pair kern="-62" kpx2="1040"/><pair kern="-13" kpx2="58"/><pair kern="-38" kpx2="1084"/><pair kern="-38" kpx2="1076"/><pair kern="-24" kpx2="1044"/><pair kern="-38" kpx2="1102"/><pair kern="-112" kpx2="44"/><pair kern="-38" kpx2="1103"/><pair kern="-13" kpx2="1054"/><pair kern="-13" kpx2="894"/><pair kern="-24" kpx2="1074"/><pair kern="-13" kpx2="1072"/><pair kern="-24" kpx2="1051"/><pair kern="-125" kpx2="46"/><pair kern="-38" kpx2="1100"/><pair kern="-49" kpx2="1083"/></kerning><kerning kpx1="8217"><pair kern="-55" kpx2="160"/><pair kern="-37" kpx2="115"/><pair kern="-37" kpx2="8217"/></kerning><kerning kpx1="1054"><pair kern="-13" kpx2="1071"/><pair kern="-24" kpx2="1051"/><pair kern="-24" kpx2="1040"/><pair kern="-24" kpx2="1076"/><pair kern="-24" kpx2="1059"/><pair kern="-13" kpx2="1044"/><pair kern="-38" kpx2="1061"/><pair kern="-13" kpx2="1046"/><pair kern="-13" kpx2="1083"/></kerning><kerning kpx1="911"><pair kern="-27" kpx2="933"/><pair kern="-27" kpx2="939"/></kerning><kerning kpx1="1075"><pair kern="-13" kpx2="1086"/><pair kern="-13" kpx2="1089"/><pair kern="-38" kpx2="1076"/><pair kern="-100" kpx2="46"/><pair kern="-24" kpx2="1083"/><pair kern="-87" kpx2="44"/></kerning><kerning kpx1="948"><pair kern="-27" kpx2="960"/><pair kern="-36" kpx2="967"/><pair kern="-27" kpx2="964"/></kerning><kerning kpx1="89"><pair kern="-74" kpx2="111"/><pair kern="-74" kpx2="58"/><pair kern="-55" kpx2="112"/><pair kern="-74" kpx2="113"/><pair kern="-55" kpx2="118"/><pair kern="-110" kpx2="44"/><pair kern="-37" kpx2="105"/><pair kern="-55" kpx2="173"/><pair kern="-91" kpx2="65"/><pair kern="-55" kpx2="97"/><pair kern="-18" kpx2="160"/><pair kern="-74" kpx2="894"/><pair kern="-55" kpx2="117"/><pair kern="-110" kpx2="46"/><pair kern="-55" kpx2="101"/></kerning></font-metrics>
\ No newline at end of file
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/arialbi.ttf b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/arialbi.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..bb09708868fcaaf22c1bca0b111c6d6a6f97707c
Binary files /dev/null and b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/arialbi.ttf differ
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/arialbi.xml b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/arialbi.xml
new file mode 100755
index 0000000000000000000000000000000000000000..590692e3bf916811f940980ead18110de2b98c45
--- /dev/null
+++ b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/arialbi.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><font-metrics metrics-version="2" type="TYPE0"><font-name>Arial,BoldItalic</font-name><embed/><cap-height>715</cap-height><x-height>518</x-height><ascender>728</ascender><descender>-210</descender><bbox><left>-559</left><bottom>-376</bottom><right>1156</right><top>1030</top></bbox><flags>96</flags><stemv>0</stemv><italicangle>-12</italicangle><subtype>TYPE0</subtype><multibyte-extras><cid-type>CIDFontType2</cid-type><default-width>0</default-width><bfranges><bf gi="3" ue="126" us="32"/><bf gi="3" ue="160" us="160"/><bf gi="163" ue="161" us="161"/><bf gi="132" ue="163" us="162"/><bf gi="764" ue="164" us="164"/><bf gi="150" ue="165" us="165"/><bf gi="230" ue="166" us="166"/><bf gi="134" ue="167" us="167"/><bf gi="142" ue="168" us="168"/><bf gi="139" ue="169" us="169"/><bf gi="157" ue="170" us="170"/><bf gi="169" ue="171" us="171"/><bf gi="164" ue="172" us="172"/><bf gi="16" ue="173" us="173"/><bf gi="138" ue="174" us="174"/><bf gi="256" ue="175" us="175"/><bf gi="131" ue="176" us="176"/><bf gi="147" ue="177" us="177"/><bf gi="240" ue="179" us="178"/><bf gi="141" ue="180" us="180"/><bf gi="151" ue="181" us="181"/><bf gi="136" ue="182" us="182"/><bf gi="194" ue="183" us="183"/><bf gi="220" ue="184" us="184"/><bf gi="239" ue="185" us="185"/><bf gi="158" ue="186" us="186"/><bf gi="170" ue="187" us="187"/><bf gi="243" ue="188" us="188"/><bf gi="242" ue="189" us="189"/><bf gi="244" ue="190" us="190"/><bf gi="162" ue="191" us="191"/><bf gi="172" ue="192" us="192"/><bf gi="200" ue="193" us="193"/><bf gi="198" ue="194" us="194"/><bf gi="173" ue="195" us="195"/><bf gi="98" ue="197" us="196"/><bf gi="144" ue="198" us="198"/><bf gi="100" ue="199" us="199"/><bf gi="202" ue="200" us="200"/><bf gi="101" ue="201" us="201"/><bf gi="199" ue="202" us="202"/><bf gi="201" ue="203" us="203"/><bf gi="206" ue="204" us="204"/><bf gi="203" ue="207" us="205"/><bf gi="231" ue="208" us="208"/><bf gi="102" ue="209" us="209"/><bf gi="209" ue="210" us="210"/><bf gi="207" ue="212" us="211"/><bf gi="174" ue="213" us="213"/><bf gi="103" ue="214" us="214"/><bf gi="238" ue="215" us="215"/><bf gi="145" ue="216" us="216"/><bf gi="212" ue="217" us="217"/><bf gi="210" ue="219" us="218"/><bf gi="104" ue="220" us="220"/><bf gi="233" ue="221" us="221"/><bf gi="235" ue="222" us="222"/><bf gi="137" ue="223" us="223"/><bf gi="106" ue="224" us="224"/><bf gi="105" ue="225" us="225"/><bf gi="107" ue="226" us="226"/><bf gi="109" ue="227" us="227"/><bf gi="108" ue="228" us="228"/><bf gi="110" ue="229" us="229"/><bf gi="160" ue="230" us="230"/><bf gi="111" ue="231" us="231"/><bf gi="113" ue="232" us="232"/><bf gi="112" ue="233" us="233"/><bf gi="114" ue="235" us="234"/><bf gi="117" ue="236" us="236"/><bf gi="116" ue="237" us="237"/><bf gi="118" ue="239" us="238"/><bf gi="232" ue="240" us="240"/><bf gi="120" ue="241" us="241"/><bf gi="122" ue="242" us="242"/><bf gi="121" ue="243" us="243"/><bf gi="123" ue="244" us="244"/><bf gi="125" ue="245" us="245"/><bf gi="124" ue="246" us="246"/><bf gi="183" ue="247" us="247"/><bf gi="161" ue="248" us="248"/><bf gi="127" ue="249" us="249"/><bf gi="126" ue="250" us="250"/><bf gi="128" ue="252" us="251"/><bf gi="234" ue="253" us="253"/><bf gi="236" ue="254" us="254"/><bf gi="185" ue="255" us="255"/><bf gi="406" ue="257" us="256"/><bf gi="258" ue="261" us="258"/><bf gi="251" ue="263" us="262"/><bf gi="408" ue="267" us="264"/><bf gi="253" ue="269" us="268"/><bf gi="262" ue="272" us="270"/><bf gi="255" ue="273" us="273"/><bf gi="412" ue="279" us="274"/><bf gi="265" ue="283" us="280"/><bf gi="418" ue="285" us="284"/><bf gi="246" ue="287" us="286"/><bf gi="420" ue="303" us="288"/><bf gi="248" ue="304" us="304"/><bf gi="213" ue="305" us="305"/><bf gi="394" ue="307" us="306"/><bf gi="436" ue="312" us="308"/><bf gi="269" ue="314" us="313"/><bf gi="441" ue="316" us="315"/><bf gi="271" ue="320" us="317"/><bf gi="224" ue="322" us="321"/><bf gi="275" ue="324" us="323"/><bf gi="443" ue="326" us="325"/><bf gi="277" ue="328" us="327"/><bf gi="396" ue="329" us="329"/><bf gi="445" ue="335" us="330"/><bf gi="279" ue="337" us="336"/><bf gi="175" ue="339" us="338"/><bf gi="281" ue="341" us="340"/><bf gi="451" ue="343" us="342"/><bf gi="283" ue="347" us="344"/><bf gi="453" ue="349" us="348"/><bf gi="249" ue="351" us="350"/><bf gi="226" ue="353" us="352"/><bf gi="287" ue="357" us="354"/><bf gi="455" ue="365" us="358"/><bf gi="291" ue="369" us="366"/><bf gi="463" ue="375" us="370"/><bf gi="186" ue="376" us="376"/><bf gi="295" ue="380" us="377"/><bf gi="228" ue="382" us="381"/><bf gi="469" ue="383" us="383"/><bf gi="166" ue="402" us="402"/><bf gi="766" ue="417" us="416"/><bf gi="768" ue="432" us="431"/><bf gi="912" ue="476" us="461"/><bf gi="470" ue="511" us="506"/><bf gi="214" ue="710" us="710"/><bf gi="223" ue="711" us="711"/><bf gi="216" ue="713" us="713"/><bf gi="217" ue="730" us="728"/><bf gi="222" ue="731" us="731"/><bf gi="215" ue="732" us="732"/><bf gi="221" ue="733" us="733"/><bf gi="806" ue="769" us="768"/><bf gi="782" ue="771" us="771"/><bf gi="776" ue="777" us="777"/><bf gi="809" ue="803" us="803"/><bf gi="30" ue="894" us="894"/><bf gi="495" ue="902" us="900"/><bf gi="476" ue="903" us="903"/><bf gi="498" ue="906" us="904"/><bf gi="501" ue="908" us="908"/><bf gi="502" ue="914" us="910"/><bf gi="299" ue="915" us="915"/><bf gi="507" ue="919" us="916"/><bf gi="300" ue="920" us="920"/><bf gi="511" ue="929" us="921"/><bf gi="520" ue="933" us="931"/><bf gi="301" ue="934" us="934"/><bf gi="523" ue="944" us="935"/><bf gi="302" ue="945" us="945"/><bf gi="533" ue="947" us="946"/><bf gi="303" ue="949" us="948"/><bf gi="535" ue="959" us="950"/><bf gi="652" ue="960" us="960"/><bf gi="545" ue="962" us="961"/><bf gi="305" ue="964" us="963"/><bf gi="547" ue="965" us="965"/><bf gi="307" ue="966" us="966"/><bf gi="548" ue="974" us="967"/><bf gi="556" ue="1036" us="1025"/><bf gi="568" ue="1103" us="1038"/><bf gi="634" ue="1116" us="1105"/><bf gi="646" ue="1119" us="1118"/><bf gi="648" ue="1169" us="1168"/><bf gi="653" ue="1465" us="1456"/><bf gi="663" ue="1475" us="1467"/><bf gi="672" ue="1514" us="1488"/><bf gi="699" ue="1524" us="1520"/><bf gi="477" ue="7813" us="7808"/><bf gi="824" ue="7921" us="7840"/><bf gi="483" ue="7923" us="7922"/><bf gi="906" ue="7929" us="7924"/><bf gi="744" ue="8207" us="8204"/><bf gi="177" ue="8212" us="8211"/><bf gi="650" ue="8213" us="8213"/><bf gi="308" ue="8215" us="8215"/><bf gi="181" ue="8217" us="8216"/><bf gi="195" ue="8218" us="8218"/><bf gi="485" ue="8219" us="8219"/><bf gi="179" ue="8221" us="8220"/><bf gi="196" ue="8222" us="8222"/><bf gi="130" ue="8224" us="8224"/><bf gi="193" ue="8225" us="8225"/><bf gi="135" ue="8226" us="8226"/><bf gi="171" ue="8230" us="8230"/><bf gi="748" ue="8235" us="8234"/><bf gi="752" ue="8236" us="8236"/><bf gi="750" ue="8238" us="8237"/><bf gi="197" ue="8240" us="8240"/><bf gi="397" ue="8243" us="8242"/><bf gi="189" ue="8250" us="8249"/><bf gi="309" ue="8252" us="8252"/><bf gi="486" ue="8254" us="8254"/><bf gi="187" ue="8260" us="8260"/><bf gi="755" ue="8301" us="8298"/><bf gi="753" ue="8303" us="8302"/><bf gi="310" ue="8319" us="8319"/><bf gi="245" ue="8355" us="8355"/><bf gi="487" ue="8356" us="8356"/><bf gi="311" ue="8359" us="8359"/><bf gi="704" ue="8362" us="8362"/><bf gi="786" ue="8363" us="8363"/><bf gi="188" ue="8364" us="8364"/><bf gi="399" ue="8453" us="8453"/><bf gi="400" ue="8467" us="8467"/><bf gi="651" ue="8470" us="8470"/><bf gi="140" ue="8482" us="8482"/><bf gi="159" ue="8486" us="8486"/><bf gi="488" ue="8494" us="8494"/><bf gi="787" ue="8532" us="8531"/><bf gi="489" ue="8542" us="8539"/><bf gi="312" ue="8597" us="8592"/><bf gi="318" ue="8616" us="8616"/><bf gi="152" ue="8706" us="8706"/><bf gi="168" ue="8710" us="8710"/><bf gi="154" ue="8719" us="8719"/><bf gi="153" ue="8721" us="8721"/><bf gi="237" ue="8722" us="8722"/><bf gi="187" ue="8725" us="8725"/><bf gi="194" ue="8729" us="8729"/><bf gi="165" ue="8730" us="8730"/><bf gi="146" ue="8734" us="8734"/><bf gi="319" ue="8735" us="8735"/><bf gi="320" ue="8745" us="8745"/><bf gi="156" ue="8747" us="8747"/><bf gi="167" ue="8776" us="8776"/><bf gi="143" ue="8800" us="8800"/><bf gi="321" ue="8801" us="8801"/><bf gi="148" ue="8805" us="8804"/><bf gi="322" ue="8962" us="8962"/><bf gi="323" ue="8976" us="8976"/><bf gi="324" ue="8993" us="8992"/><bf gi="326" ue="9472" us="9472"/><bf gi="327" ue="9474" us="9474"/><bf gi="328" ue="9484" us="9484"/><bf gi="329" ue="9488" us="9488"/><bf gi="330" ue="9492" us="9492"/><bf gi="331" ue="9496" us="9496"/><bf gi="332" ue="9500" us="9500"/><bf gi="333" ue="9508" us="9508"/><bf gi="334" ue="9516" us="9516"/><bf gi="335" ue="9524" us="9524"/><bf gi="336" ue="9532" us="9532"/><bf gi="337" ue="9580" us="9552"/><bf gi="366" ue="9600" us="9600"/><bf gi="367" ue="9604" us="9604"/><bf gi="368" ue="9608" us="9608"/><bf gi="369" ue="9612" us="9612"/><bf gi="370" ue="9619" us="9616"/><bf gi="374" ue="9632" us="9632"/><bf gi="401" ue="9633" us="9633"/><bf gi="402" ue="9643" us="9642"/><bf gi="375" ue="9644" us="9644"/><bf gi="376" ue="9650" us="9650"/><bf gi="377" ue="9658" us="9658"/><bf gi="378" ue="9660" us="9660"/><bf gi="379" ue="9668" us="9668"/><bf gi="184" ue="9674" us="9674"/><bf gi="380" ue="9675" us="9675"/><bf gi="404" ue="9679" us="9679"/><bf gi="381" ue="9689" us="9688"/><bf gi="405" ue="9702" us="9702"/><bf gi="383" ue="9788" us="9786"/><bf gi="386" ue="9792" us="9792"/><bf gi="387" ue="9794" us="9794"/><bf gi="388" ue="9824" us="9824"/><bf gi="389" ue="9827" us="9827"/><bf gi="390" ue="9830" us="9829"/><bf gi="392" ue="9835" us="9834"/><bf gi="705" ue="59397" us="59393"/><bf gi="191" ue="61442" us="61441"/><bf gi="493" ue="61445" us="61444"/><bf gi="773" ue="61447" us="61446"/><bf gi="789" ue="61448" us="61448"/><bf gi="775" ue="61449" us="61449"/><bf gi="759" ue="61454" us="61450"/><bf gi="792" ue="61455" us="61455"/><bf gi="777" ue="61456" us="61456"/><bf gi="779" ue="61457" us="61457"/><bf gi="793" ue="61458" us="61458"/><bf gi="778" ue="61459" us="61459"/><bf gi="794" ue="61460" us="61460"/><bf gi="781" ue="61461" us="61461"/><bf gi="795" ue="61467" us="61462"/><bf gi="780" ue="61468" us="61468"/><bf gi="808" ue="61469" us="61469"/><bf gi="801" ue="61474" us="61470"/><bf gi="810" ue="61475" us="61475"/><bf gi="814" ue="61480" us="61476"/><bf gi="811" ue="61483" us="61481"/><bf gi="785" ue="61484" us="61484"/><bf gi="819" ue="61489" us="61485"/><bf gi="191" ue="64258" us="64257"/><bf gi="710" ue="64288" us="64288"/><bf gi="711" ue="64310" us="64298"/><bf gi="724" ue="64316" us="64312"/><bf gi="729" ue="64318" us="64318"/><bf gi="730" ue="64321" us="64320"/><bf gi="732" ue="64324" us="64323"/><bf gi="734" ue="64335" us="64326"/><bf gi="765" ue="65532" us="65532"/><bf gi="0" ue="65535" us="65535"/></bfranges><cid-widths start-index="0"><wx w="750"/><wx w="0"/><wx w="277"/><wx w="277"/><wx w="333"/><wx w="474"/><wx w="556"/><wx w="556"/><wx w="889"/><wx w="722"/><wx w="237"/><wx w="333"/><wx w="333"/><wx w="389"/><wx w="583"/><wx w="277"/><wx w="333"/><wx w="277"/><wx w="277"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="333"/><wx w="333"/><wx w="583"/><wx w="583"/><wx w="583"/><wx w="610"/><wx w="975"/><wx w="722"/><wx w="722"/><wx w="722"/><wx w="722"/><wx w="666"/><wx w="610"/><wx w="777"/><wx w="722"/><wx w="277"/><wx w="556"/><wx w="722"/><wx w="610"/><wx w="833"/><wx w="722"/><wx w="777"/><wx w="666"/><wx w="777"/><wx w="722"/><wx w="666"/><wx w="610"/><wx w="722"/><wx w="666"/><wx w="943"/><wx w="666"/><wx w="666"/><wx w="610"/><wx w="333"/><wx w="277"/><wx w="333"/><wx w="583"/><wx w="556"/><wx w="333"/><wx w="556"/><wx w="610"/><wx w="556"/><wx w="610"/><wx w="556"/><wx w="333"/><wx w="610"/><wx w="610"/><wx w="277"/><wx w="277"/><wx w="556"/><wx w="277"/><wx w="889"/><wx w="610"/><wx w="610"/><wx w="610"/><wx w="610"/><wx w="389"/><wx w="556"/><wx w="333"/><wx w="610"/><wx w="556"/><wx w="777"/><wx w="556"/><wx w="556"/><wx w="500"/><wx w="389"/><wx w="279"/><wx w="389"/><wx w="583"/><wx w="722"/><wx w="722"/><wx w="722"/><wx w="666"/><wx w="722"/><wx w="777"/><wx w="722"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="277"/><wx w="277"/><wx w="277"/><wx w="277"/><wx w="610"/><wx w="610"/><wx w="610"/><wx w="610"/><wx w="610"/><wx w="610"/><wx w="610"/><wx w="610"/><wx w="610"/><wx w="610"/><wx w="556"/><wx w="399"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="350"/><wx w="556"/><wx w="610"/><wx w="736"/><wx w="736"/><wx w="1000"/><wx w="333"/><wx w="333"/><wx w="548"/><wx w="1000"/><wx w="777"/><wx w="712"/><wx w="548"/><wx w="548"/><wx w="548"/><wx w="556"/><wx w="576"/><wx w="494"/><wx w="712"/><wx w="823"/><wx w="548"/><wx w="273"/><wx w="370"/><wx w="365"/><wx w="768"/><wx w="889"/><wx w="610"/><wx w="610"/><wx w="333"/><wx w="583"/><wx w="548"/><wx w="556"/><wx w="548"/><wx w="611"/><wx w="556"/><wx w="556"/><wx w="1000"/><wx w="722"/><wx w="722"/><wx w="777"/><wx w="1000"/><wx w="943"/><wx w="556"/><wx w="1000"/><wx w="500"/><wx w="500"/><wx w="277"/><wx w="277"/><wx w="548"/><wx w="494"/><wx w="556"/><wx w="666"/><wx w="166"/><wx w="556"/><wx w="333"/><wx w="333"/><wx w="610"/><wx w="610"/><wx w="556"/><wx w="277"/><wx w="277"/><wx w="500"/><wx w="1000"/><wx w="722"/><wx w="666"/><wx w="722"/><wx w="666"/><wx w="666"/><wx w="277"/><wx w="277"/><wx w="277"/><wx w="277"/><wx w="777"/><wx w="777"/><wx w="777"/><wx w="722"/><wx w="722"/><wx w="722"/><wx w="277"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="610"/><wx w="277"/><wx w="666"/><wx w="556"/><wx w="610"/><wx w="500"/><wx w="279"/><wx w="722"/><wx w="610"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="610"/><wx w="583"/><wx w="583"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="833"/><wx w="833"/><wx w="833"/><wx w="556"/><wx w="777"/><wx w="610"/><wx w="277"/><wx w="666"/><wx w="556"/><wx w="722"/><wx w="556"/><wx w="722"/><wx w="556"/><wx w="610"/><wx w="552"/><wx w="333"/><wx w="722"/><wx w="556"/><wx w="722"/><wx w="556"/><wx w="722"/><wx w="739"/><wx w="722"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="610"/><wx w="277"/><wx w="610"/><wx w="395"/><wx w="610"/><wx w="479"/><wx w="722"/><wx w="610"/><wx w="722"/><wx w="610"/><wx w="777"/><wx w="610"/><wx w="722"/><wx w="389"/><wx w="722"/><wx w="389"/><wx w="666"/><wx w="556"/><wx w="610"/><wx w="333"/><wx w="610"/><wx w="479"/><wx w="722"/><wx w="610"/><wx w="722"/><wx w="610"/><wx w="610"/><wx w="500"/><wx w="610"/><wx w="500"/><wx w="609"/><wx w="777"/><wx w="822"/><wx w="620"/><wx w="610"/><wx w="478"/><wx w="663"/><wx w="408"/><wx w="703"/><wx w="552"/><wx w="604"/><wx w="395"/><wx w="1104"/><wx w="1000"/><wx w="500"/><wx w="1000"/><wx w="500"/><wx w="1000"/><wx w="500"/><wx w="500"/><wx w="979"/><wx w="722"/><wx w="583"/><wx w="604"/><wx w="583"/><wx w="604"/><wx w="604"/><wx w="708"/><wx w="625"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="729"/><wx w="604"/><wx w="1000"/><wx w="989"/><wx w="989"/><wx w="989"/><wx w="989"/><wx w="604"/><wx w="604"/><wx w="604"/><wx w="1020"/><wx w="1052"/><wx w="916"/><wx w="750"/><wx w="750"/><wx w="531"/><wx w="656"/><wx w="593"/><wx w="510"/><wx w="500"/><wx w="750"/><wx w="782"/><wx w="556"/><wx w="708"/><wx w="239"/><wx w="479"/><wx w="885"/><wx w="516"/><wx w="604"/><wx w="354"/><wx w="354"/><wx w="604"/><wx w="354"/><wx w="722"/><wx w="556"/><wx w="722"/><wx w="556"/><wx w="722"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="777"/><wx w="610"/><wx w="777"/><wx w="610"/><wx w="777"/><wx w="610"/><wx w="722"/><wx w="610"/><wx w="722"/><wx w="610"/><wx w="277"/><wx w="277"/><wx w="277"/><wx w="277"/><wx w="277"/><wx w="277"/><wx w="277"/><wx w="277"/><wx w="556"/><wx w="277"/><wx w="722"/><wx w="556"/><wx w="556"/><wx w="610"/><wx w="277"/><wx w="722"/><wx w="610"/><wx w="723"/><wx w="610"/><wx w="777"/><wx w="610"/><wx w="777"/><wx w="610"/><wx w="722"/><wx w="389"/><wx w="666"/><wx w="556"/><wx w="610"/><wx w="333"/><wx w="722"/><wx w="610"/><wx w="722"/><wx w="610"/><wx w="722"/><wx w="610"/><wx w="722"/><wx w="610"/><wx w="943"/><wx w="777"/><wx w="666"/><wx w="556"/><wx w="277"/><wx w="722"/><wx w="556"/><wx w="1000"/><wx w="889"/><wx w="777"/><wx w="610"/><wx w="333"/><wx w="943"/><wx w="777"/><wx w="943"/><wx w="777"/><wx w="943"/><wx w="777"/><wx w="666"/><wx w="556"/><wx w="277"/><wx w="333"/><wx w="556"/><wx w="600"/><wx w="833"/><wx w="833"/><wx w="833"/><wx w="833"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="722"/><wx w="854"/><wx w="905"/><wx w="473"/><wx w="844"/><wx w="930"/><wx w="847"/><wx w="277"/><wx w="722"/><wx w="722"/><wx w="671"/><wx w="666"/><wx w="610"/><wx w="722"/><wx w="277"/><wx w="722"/><wx w="666"/><wx w="833"/><wx w="722"/><wx w="657"/><wx w="777"/><wx w="717"/><wx w="666"/><wx w="590"/><wx w="610"/><wx w="666"/><wx w="666"/><wx w="828"/><wx w="780"/><wx w="277"/><wx w="666"/><wx w="620"/><wx w="478"/><wx w="610"/><wx w="277"/><wx w="591"/><wx w="620"/><wx w="556"/><wx w="491"/><wx w="610"/><wx w="557"/><wx w="277"/><wx w="565"/><wx w="556"/><wx w="603"/><wx w="556"/><wx w="449"/><wx w="610"/><wx w="605"/><wx w="532"/><wx w="591"/><wx w="577"/><wx w="772"/><wx w="834"/><wx w="277"/><wx w="591"/><wx w="610"/><wx w="591"/><wx w="834"/><wx w="666"/><wx w="885"/><wx w="613"/><wx w="718"/><wx w="666"/><wx w="277"/><wx w="277"/><wx w="556"/><wx w="1094"/><wx w="1041"/><wx w="853"/><wx w="622"/><wx w="677"/><wx w="719"/><wx w="722"/><wx w="708"/><wx w="722"/><wx w="613"/><wx w="722"/><wx w="666"/><wx w="927"/><wx w="642"/><wx w="719"/><wx w="719"/><wx w="614"/><wx w="687"/><wx w="833"/><wx w="722"/><wx w="777"/><wx w="719"/><wx w="666"/><wx w="722"/><wx w="610"/><wx w="677"/><wx w="780"/><wx w="666"/><wx w="729"/><wx w="708"/><wx w="979"/><wx w="988"/><wx w="854"/><wx w="1000"/><wx w="708"/><wx w="718"/><wx w="1041"/><wx w="729"/><wx w="556"/><wx w="619"/><wx w="604"/><wx w="533"/><wx w="618"/><wx w="556"/><wx w="736"/><wx w="510"/><wx w="610"/><wx w="610"/><wx w="506"/><wx w="622"/><wx w="739"/><wx w="604"/><wx w="610"/><wx w="610"/><wx w="610"/><wx w="556"/><wx w="889"/><wx w="556"/><wx w="884"/><wx w="556"/><wx w="645"/><wx w="583"/><wx w="889"/><wx w="935"/><wx w="707"/><wx w="854"/><wx w="593"/><wx w="551"/><wx w="864"/><wx w="588"/><wx w="556"/><wx w="610"/><wx w="469"/><wx w="562"/><wx w="556"/><wx w="277"/><wx w="277"/><wx w="277"/><wx w="969"/><wx w="905"/><wx w="610"/><wx w="506"/><wx w="556"/><wx w="610"/><wx w="575"/><wx w="466"/><wx w="1000"/><wx w="1145"/><wx w="711"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="446"/><wx w="333"/><wx w="299"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="582"/><wx w="575"/><wx w="456"/><wx w="549"/><wx w="614"/><wx w="272"/><wx w="413"/><wx w="615"/><wx w="626"/><wx w="272"/><wx w="521"/><wx w="490"/><wx w="496"/><wx w="610"/><wx w="629"/><wx w="272"/><wx w="385"/><wx w="613"/><wx w="543"/><wx w="593"/><wx w="586"/><wx w="499"/><wx w="511"/><wx w="572"/><wx w="521"/><wx w="714"/><wx w="673"/><wx w="545"/><wx w="545"/><wx w="545"/><wx w="276"/><wx w="504"/><wx w="817"/><wx w="272"/><wx w="521"/><wx w="521"/><wx w="496"/><wx w="496"/><wx w="559"/><wx w="714"/><wx w="714"/><wx w="714"/><wx w="714"/><wx w="582"/><wx w="582"/><wx w="582"/><wx w="575"/><wx w="454"/><wx w="549"/><wx w="614"/><wx w="322"/><wx w="437"/><wx w="626"/><wx w="322"/><wx w="521"/><wx w="490"/><wx w="496"/><wx w="629"/><wx w="385"/><wx w="613"/><wx w="593"/><wx w="586"/><wx w="511"/><wx w="572"/><wx w="521"/><wx w="714"/><wx w="673"/><wx w="272"/><wx w="575"/><wx w="490"/><wx w="586"/><wx w="606"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="556"/><wx w="1000"/><wx w="837"/><wx w="671"/><wx w="808"/><wx w="713"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="513"/><wx w="833"/><wx w="833"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="277"/><wx w="722"/><wx w="556"/><wx w="722"/><wx w="556"/><wx w="722"/><wx w="556"/><wx w="722"/><wx w="556"/><wx w="722"/><wx w="556"/><wx w="722"/><wx w="556"/><wx w="722"/><wx w="556"/><wx w="722"/><wx w="556"/><wx w="722"/><wx w="556"/><wx w="722"/><wx w="556"/><wx w="722"/><wx w="556"/><wx w="722"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="277"/><wx w="277"/><wx w="277"/><wx w="277"/><wx w="777"/><wx w="610"/><wx w="777"/><wx w="610"/><wx w="777"/><wx w="610"/><wx w="777"/><wx w="610"/><wx w="777"/><wx w="610"/><wx w="777"/><wx w="610"/><wx w="777"/><wx w="610"/><wx w="837"/><wx w="671"/><wx w="837"/><wx w="671"/><wx w="837"/><wx w="671"/><wx w="837"/><wx w="671"/><wx w="837"/><wx w="671"/><wx w="722"/><wx w="610"/><wx w="722"/><wx w="610"/><wx w="808"/><wx w="713"/><wx w="808"/><wx w="713"/><wx w="808"/><wx w="713"/><wx w="808"/><wx w="713"/><wx w="808"/><wx w="713"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="722"/><wx w="556"/><wx w="277"/><wx w="277"/><wx w="777"/><wx w="610"/><wx w="722"/><wx w="610"/><wx w="722"/><wx w="610"/><wx w="722"/><wx w="610"/><wx w="722"/><wx w="610"/><wx w="722"/><wx w="610"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/></cid-widths></multibyte-extras><kerning kpx1="972"><pair kern="-17" kpx2="960"/><pair kern="-27" kpx2="967"/><pair kern="-18" kpx2="947"/></kerning><kerning kpx1="1088"><pair kern="-24" kpx2="1093"/><pair kern="-13" kpx2="1101"/><pair kern="-13" kpx2="1079"/><pair kern="-25" kpx2="1091"/><pair kern="-13" kpx2="1084"/><pair kern="-49" kpx2="1095"/><pair kern="-13" kpx2="1078"/><pair kern="-13" kpx2="1083"/></kerning><kerning kpx1="908"><pair kern="-40" kpx2="933"/><pair kern="-40" kpx2="939"/></kerning><kerning kpx1="960"><pair kern="14" kpx2="974"/><pair kern="14" kpx2="966"/><pair kern="14" kpx2="969"/></kerning><kerning kpx1="927"><pair kern="-40" kpx2="933"/><pair kern="-40" kpx2="939"/><pair kern="-27" kpx2="913"/></kerning><kerning kpx1="86"><pair kern="-37" kpx2="111"/><pair kern="-37" kpx2="58"/><pair kern="-18" kpx2="114"/><pair kern="-91" kpx2="44"/><pair kern="-37" kpx2="105"/><pair kern="-37" kpx2="173"/><pair kern="-74" kpx2="65"/><pair kern="-37" kpx2="97"/><pair kern="-37" kpx2="894"/><pair kern="-18" kpx2="117"/><pair kern="-18" kpx2="121"/><pair kern="-91" kpx2="46"/><pair kern="-37" kpx2="101"/></kerning><kerning kpx1="958"><pair kern="-20" kpx2="972"/><pair kern="-20" kpx2="940"/><pair kern="-20" kpx2="950"/><pair kern="-20" kpx2="948"/><pair kern="-20" kpx2="963"/><pair kern="-20" kpx2="966"/><pair kern="-20" kpx2="959"/><pair kern="-20" kpx2="945"/><pair kern="-20" kpx2="962"/><pair kern="-20" kpx2="958"/></kerning><kerning kpx1="118"><pair kern="-55" kpx2="46"/><pair kern="-55" kpx2="44"/></kerning><kerning kpx1="1086"><pair kern="-24" kpx2="1093"/><pair kern="-13" kpx2="1101"/><pair kern="-24" kpx2="1091"/><pair kern="12" kpx2="1072"/><pair kern="-49" kpx2="1095"/><pair kern="-13" kpx2="1078"/></kerning><kerning kpx1="1050"><pair kern="-38" kpx2="1086"/><pair kern="-13" kpx2="1054"/><pair kern="-38" kpx2="1060"/><pair kern="-38" kpx2="1089"/><pair kern="-38" kpx2="1077"/><pair kern="-24" kpx2="1101"/><pair kern="-24" kpx2="1079"/><pair kern="-13" kpx2="1091"/><pair kern="-13" kpx2="1057"/><pair kern="49" kpx2="1063"/><pair kern="12" kpx2="1058"/></kerning><kerning kpx1="1060"><pair kern="-38" kpx2="1071"/><pair kern="12" kpx2="1052"/><pair kern="-24" kpx2="1051"/><pair kern="-38" kpx2="1040"/><pair kern="-62" kpx2="1059"/><pair kern="-24" kpx2="1044"/><pair kern="24" kpx2="1063"/><pair kern="-62" kpx2="1058"/><pair kern="-13" kpx2="1083"/></kerning><kerning kpx1="160"><pair kern="-37" kpx2="923"/><pair kern="-18" kpx2="933"/><pair kern="-37" kpx2="916"/><pair kern="-37" kpx2="65"/><pair kern="-18" kpx2="89"/><pair kern="-18" kpx2="939"/><pair kern="-37" kpx2="902"/><pair kern="-37" kpx2="913"/></kerning><kerning kpx1="1047"><pair kern="-24" kpx2="1071"/><pair kern="-24" kpx2="1054"/><pair kern="-24" kpx2="1060"/><pair kern="-24" kpx2="1057"/><pair kern="-13" kpx2="1076"/><pair kern="-38" kpx2="1059"/><pair kern="-24" kpx2="1046"/><pair kern="24" kpx2="1063"/><pair kern="-38" kpx2="1058"/><pair kern="12" kpx2="1083"/></kerning><kerning kpx1="1057"><pair kern="-24" kpx2="1069"/><pair kern="12" kpx2="1079"/><pair kern="-24" kpx2="1047"/><pair kern="24" kpx2="1072"/><pair kern="-24" kpx2="1040"/><pair kern="-49" kpx2="1066"/><pair kern="-38" kpx2="1059"/><pair kern="-13" kpx2="1095"/><pair kern="-13" kpx2="1061"/><pair kern="12" kpx2="1078"/><pair kern="12" kpx2="1063"/><pair kern="-38" kpx2="1058"/></kerning><kerning kpx1="937"><pair kern="-40" kpx2="933"/><pair kern="-40" kpx2="939"/></kerning><kerning kpx1="913"><pair kern="-28" kpx2="967"/><pair kern="-123" kpx2="933"/><pair kern="-28" kpx2="957"/><pair kern="-37" kpx2="160"/><pair kern="-57" kpx2="920"/><pair kern="-123" kpx2="939"/><pair kern="-57" kpx2="927"/><pair kern="-57" kpx2="934"/><pair kern="-91" kpx2="932"/><pair kern="-28" kpx2="947"/><pair kern="-55" kpx2="8217"/></kerning><kerning kpx1="82"><pair kern="-18" kpx2="87"/><pair kern="-18" kpx2="89"/><pair kern="-18" kpx2="84"/></kerning><kerning kpx1="119"><pair kern="-37" kpx2="46"/><pair kern="-37" kpx2="44"/></kerning><kerning kpx1="1045"><pair kern="12" kpx2="1089"/><pair kern="-13" kpx2="1047"/><pair kern="12" kpx2="1051"/></kerning><kerning kpx1="1101"><pair kern="-24" kpx2="1093"/><pair kern="-13" kpx2="1086"/><pair kern="-13" kpx2="1089"/><pair kern="-13" kpx2="1077"/><pair kern="-13" kpx2="1079"/><pair kern="-24" kpx2="1084"/><pair kern="-13" kpx2="1078"/><pair kern="-13" kpx2="1092"/><pair kern="-13" kpx2="1073"/></kerning><kerning kpx1="1084"><pair kern="-13" kpx2="1079"/></kerning><kerning kpx1="1052"><pair kern="12" kpx2="1091"/><pair kern="12" kpx2="1072"/><pair kern="-13" kpx2="1095"/><pair kern="37" kpx2="1063"/></kerning><kerning kpx1="939"><pair kern="-37" kpx2="972"/><pair kern="-55" kpx2="923"/><pair kern="-37" kpx2="940"/><pair kern="-37" kpx2="963"/><pair kern="-37" kpx2="951"/><pair kern="-37" kpx2="954"/><pair kern="-37" kpx2="959"/><pair kern="129" kpx2="912"/><pair kern="-37" kpx2="943"/><pair kern="-37" kpx2="953"/><pair kern="63" kpx2="970"/><pair kern="-37" kpx2="948"/><pair kern="-65" kpx2="916"/><pair kern="-37" kpx2="942"/><pair kern="-37" kpx2="956"/><pair kern="-37" kpx2="966"/><pair kern="-37" kpx2="945"/><pair kern="-88" kpx2="913"/></kerning><kerning kpx1="959"><pair kern="-17" kpx2="960"/><pair kern="-27" kpx2="967"/><pair kern="-17" kpx2="964"/><pair kern="-18" kpx2="947"/></kerning><kerning kpx1="915"><pair kern="-86" kpx2="923"/><pair kern="-18" kpx2="953"/><pair kern="63" kpx2="970"/><pair kern="-86" kpx2="916"/><pair kern="-109" kpx2="46"/><pair kern="129" kpx2="912"/><pair kern="-86" kpx2="913"/><pair kern="-109" kpx2="44"/></kerning><kerning kpx1="1058"><pair kern="12" kpx2="1069"/><pair kern="-24" kpx2="1088"/><pair kern="-24" kpx2="1097"/><pair kern="-38" kpx2="1077"/><pair kern="-38" kpx2="1080"/><pair kern="-38" kpx2="1086"/><pair kern="-13" kpx2="1060"/><pair kern="-13" kpx2="1099"/><pair kern="-38" kpx2="1089"/><pair kern="-24" kpx2="1091"/><pair kern="-38" kpx2="1040"/><pair kern="-13" kpx2="1087"/><pair kern="-24" kpx2="1093"/><pair kern="-24" kpx2="1084"/><pair kern="12" kpx2="1052"/><pair kern="-13" kpx2="1102"/><pair kern="-38" kpx2="44"/><pair kern="-13" kpx2="1103"/><pair kern="-13" kpx2="1054"/><pair kern="-24" kpx2="1082"/><pair kern="-38" kpx2="1074"/><pair kern="-38" kpx2="46"/><pair kern="-13" kpx2="1100"/><pair kern="24" kpx2="1046"/><pair kern="-24" kpx2="1083"/></kerning><kerning kpx1="920"><pair kern="-40" kpx2="933"/><pair kern="-40" kpx2="939"/><pair kern="-27" kpx2="913"/></kerning><kerning kpx1="121"><pair kern="-37" kpx2="46"/><pair kern="-37" kpx2="44"/></kerning><kerning kpx1="1051"><pair kern="-13" kpx2="1060"/><pair kern="12" kpx2="1091"/><pair kern="12" kpx2="1072"/></kerning><kerning kpx1="1046"><pair kern="-13" kpx2="1086"/><pair kern="-13" kpx2="1054"/><pair kern="-13" kpx2="1077"/><pair kern="-13" kpx2="1091"/><pair kern="-13" kpx2="1057"/><pair kern="-13" kpx2="1047"/><pair kern="12" kpx2="1072"/><pair kern="12" kpx2="1066"/><pair kern="37" kpx2="1063"/></kerning><kerning kpx1="1041"><pair kern="-24" kpx2="1069"/><pair kern="12" kpx2="1044"/><pair kern="-49" kpx2="1066"/><pair kern="-13" kpx2="1061"/><pair kern="-38" kpx2="1058"/><pair kern="12" kpx2="1103"/><pair kern="-24" kpx2="1071"/><pair kern="-13" kpx2="1054"/><pair kern="-25" kpx2="1060"/><pair kern="-13" kpx2="1091"/><pair kern="-13" kpx2="1047"/><pair kern="-13" kpx2="1057"/><pair kern="-38" kpx2="1040"/><pair kern="12" kpx2="1051"/><pair kern="-24" kpx2="1059"/><pair kern="-13" kpx2="1046"/><pair kern="-13" kpx2="1063"/><pair kern="12" kpx2="1083"/></kerning><kerning kpx1="1083"><pair kern="-13" kpx2="1086"/><pair kern="-13" kpx2="1089"/><pair kern="-13" kpx2="1077"/><pair kern="-13" kpx2="1091"/><pair kern="-24" kpx2="1095"/><pair kern="-13" kpx2="1092"/><pair kern="-13" kpx2="1073"/></kerning><kerning kpx1="1097"><pair kern="-24" kpx2="1086"/><pair kern="-24" kpx2="1077"/></kerning><kerning kpx1="950"><pair kern="-107" kpx2="972"/><pair kern="-107" kpx2="940"/><pair kern="-27" kpx2="960"/><pair kern="-107" kpx2="963"/><pair kern="-38" kpx2="951"/><pair kern="-38" kpx2="954"/><pair kern="-107" kpx2="959"/><pair kern="-27" kpx2="964"/><pair kern="-27" kpx2="947"/><pair kern="-38" kpx2="953"/><pair kern="-36" kpx2="948"/><pair kern="-107" kpx2="974"/><pair kern="-20" kpx2="952"/><pair kern="-27" kpx2="957"/><pair kern="-38" kpx2="942"/><pair kern="-107" kpx2="966"/><pair kern="-107" kpx2="969"/><pair kern="-107" kpx2="945"/></kerning><kerning kpx1="929"><pair kern="-74" kpx2="923"/><pair kern="-74" kpx2="916"/><pair kern="-127" kpx2="46"/><pair kern="-74" kpx2="913"/><pair kern="-127" kpx2="44"/></kerning><kerning kpx1="87"><pair kern="-18" kpx2="111"/><pair kern="-37" kpx2="58"/><pair kern="-18" kpx2="114"/><pair kern="-74" kpx2="44"/><pair kern="-8" kpx2="105"/><pair kern="-37" kpx2="173"/><pair kern="-55" kpx2="65"/><pair kern="-18" kpx2="97"/><pair kern="-37" kpx2="894"/><pair kern="-18" kpx2="117"/><pair kern="-18" kpx2="121"/><pair kern="-74" kpx2="46"/><pair kern="-18" kpx2="101"/></kerning><kerning kpx1="932"><pair kern="-37" kpx2="972"/><pair kern="-37" kpx2="940"/><pair kern="-37" kpx2="963"/><pair kern="-18" kpx2="971"/><pair kern="-18" kpx2="927"/><pair kern="-26" kpx2="947"/><pair kern="-18" kpx2="953"/><pair kern="-44" kpx2="916"/><pair kern="-37" kpx2="966"/><pair kern="-18" kpx2="937"/><pair kern="-37" kpx2="945"/><pair kern="-74" kpx2="913"/><pair kern="-44" kpx2="923"/><pair kern="-37" kpx2="967"/><pair kern="-74" kpx2="58"/><pair kern="-18" kpx2="951"/><pair kern="-26" kpx2="968"/><pair kern="-37" kpx2="959"/><pair kern="137" kpx2="912"/><pair kern="-74" kpx2="44"/><pair kern="-18" kpx2="965"/><pair kern="-55" kpx2="173"/><pair kern="63" kpx2="970"/><pair kern="-37" kpx2="948"/><pair kern="-74" kpx2="894"/><pair kern="-37" kpx2="957"/><pair kern="-18" kpx2="920"/><pair kern="-18" kpx2="956"/><pair kern="-74" kpx2="46"/><pair kern="-37" kpx2="949"/><pair kern="-18" kpx2="934"/><pair kern="-18" kpx2="973"/><pair kern="-37" kpx2="941"/></kerning><kerning kpx1="964"><pair kern="14" kpx2="974"/><pair kern="14" kpx2="966"/><pair kern="14" kpx2="969"/></kerning><kerning kpx1="1061"><pair kern="-13" kpx2="1069"/><pair kern="-38" kpx2="1086"/><pair kern="-13" kpx2="1054"/><pair kern="-24" kpx2="1060"/><pair kern="-13" kpx2="1091"/><pair kern="-13" kpx2="1057"/><pair kern="12" kpx2="1047"/></kerning><kerning kpx1="65"><pair kern="-55" kpx2="87"/><pair kern="-37" kpx2="160"/><pair kern="-74" kpx2="89"/><pair kern="-74" kpx2="84"/><pair kern="-74" kpx2="86"/><pair kern="-55" kpx2="8217"/></kerning><kerning kpx1="974"><pair kern="-17" kpx2="960"/><pair kern="-27" kpx2="967"/><pair kern="-18" kpx2="947"/></kerning><kerning kpx1="1027"><pair kern="-100" kpx2="46"/><pair kern="-100" kpx2="44"/></kerning><kerning kpx1="1079"><pair kern="-13" kpx2="1086"/><pair kern="-13" kpx2="1089"/><pair kern="-13" kpx2="1077"/><pair kern="-13" kpx2="1079"/><pair kern="-38" kpx2="1091"/><pair kern="-13" kpx2="1084"/><pair kern="-49" kpx2="1098"/><pair kern="-13" kpx2="1076"/><pair kern="-49" kpx2="1095"/><pair kern="-13" kpx2="1092"/><pair kern="-13" kpx2="1073"/></kerning><kerning kpx1="1091"><pair kern="12" kpx2="1103"/><pair kern="12" kpx2="1093"/><pair kern="12" kpx2="1079"/><pair kern="-38" kpx2="46"/><pair kern="12" kpx2="1078"/><pair kern="12" kpx2="1073"/><pair kern="-38" kpx2="44"/></kerning><kerning kpx1="1040"><pair kern="-49" kpx2="1069"/><pair kern="-24" kpx2="1077"/><pair kern="37" kpx2="1044"/><pair kern="-24" kpx2="1092"/><pair kern="-101" kpx2="1058"/><pair kern="-75" kpx2="8217"/><pair kern="-24" kpx2="1086"/><pair kern="-49" kpx2="1054"/><pair kern="-62" kpx2="1060"/><pair kern="-24" kpx2="1089"/><pair kern="-24" kpx2="1091"/><pair kern="-38" kpx2="1047"/><pair kern="-49" kpx2="1057"/><pair kern="12" kpx2="1072"/><pair kern="12" kpx2="1051"/><pair kern="-24" kpx2="1055"/><pair kern="-62" kpx2="1059"/><pair kern="-49" kpx2="1063"/><pair kern="-24" kpx2="1073"/></kerning><kerning kpx1="969"><pair kern="-17" kpx2="960"/><pair kern="-27" kpx2="967"/><pair kern="-18" kpx2="947"/></kerning><kerning kpx1="1059"><pair kern="-24" kpx2="1088"/><pair kern="-13" kpx2="1069"/><pair kern="-24" kpx2="1097"/><pair kern="-49" kpx2="1077"/><pair kern="-24" kpx2="1085"/><pair kern="-38" kpx2="1080"/><pair kern="-62" kpx2="1086"/><pair kern="-38" kpx2="1060"/><pair kern="-24" kpx2="1096"/><pair kern="-49" kpx2="1089"/><pair kern="-38" kpx2="1079"/><pair kern="-13" kpx2="1047"/><pair kern="-75" kpx2="1040"/><pair kern="-24" kpx2="1087"/><pair kern="-13" kpx2="1078"/><pair kern="-24" kpx2="1093"/><pair kern="-24" kpx2="58"/><pair kern="-24" kpx2="1084"/><pair kern="-24" kpx2="1094"/><pair kern="-24" kpx2="1076"/><pair kern="-24" kpx2="1081"/><pair kern="-24" kpx2="1102"/><pair kern="-38" kpx2="1044"/><pair kern="-75" kpx2="44"/><pair kern="-24" kpx2="1103"/><pair kern="-13" kpx2="1071"/><pair kern="-13" kpx2="1054"/><pair kern="-38" kpx2="1075"/><pair kern="-24" kpx2="1082"/><pair kern="-24" kpx2="894"/><pair kern="-49" kpx2="1074"/><pair kern="-13" kpx2="1051"/><pair kern="-75" kpx2="46"/><pair kern="-24" kpx2="1073"/><pair kern="-38" kpx2="1083"/></kerning><kerning kpx1="923"><pair kern="-123" kpx2="933"/><pair kern="-37" kpx2="160"/><pair kern="-20" kpx2="920"/><pair kern="-123" kpx2="939"/><pair kern="-20" kpx2="927"/><pair kern="-91" kpx2="932"/></kerning><kerning kpx1="967"><pair kern="-14" kpx2="972"/><pair kern="-14" kpx2="940"/><pair kern="-14" kpx2="950"/><pair kern="-14" kpx2="948"/><pair kern="-14" kpx2="974"/><pair kern="-14" kpx2="963"/><pair kern="-14" kpx2="966"/><pair kern="-14" kpx2="969"/><pair kern="-14" kpx2="959"/><pair kern="-14" kpx2="945"/><pair kern="-14" kpx2="962"/></kerning><kerning kpx1="961"><pair kern="-17" kpx2="960"/><pair kern="-27" kpx2="967"/></kerning><kerning kpx1="114"><pair kern="-55" kpx2="46"/><pair kern="37" kpx2="8217"/><pair kern="-55" kpx2="44"/></kerning><kerning kpx1="1062"><pair kern="24" kpx2="1072"/></kerning><kerning kpx1="931"><pair kern="-23" kpx2="964"/></kerning><kerning kpx1="954"><pair kern="-38" kpx2="940"/><pair kern="-38" kpx2="972"/><pair kern="-38" kpx2="950"/><pair kern="-38" kpx2="963"/><pair kern="-38" kpx2="959"/><pair kern="-38" kpx2="958"/><pair kern="-38" kpx2="948"/><pair kern="-38" kpx2="974"/><pair kern="-38" kpx2="952"/><pair kern="-38" kpx2="966"/><pair kern="-38" kpx2="969"/><pair kern="-38" kpx2="945"/><pair kern="-38" kpx2="962"/></kerning><kerning kpx1="922"><pair kern="-19" kpx2="972"/><pair kern="-19" kpx2="940"/><pair kern="-19" kpx2="950"/><pair kern="-19" kpx2="963"/><pair kern="-71" kpx2="927"/><pair kern="-19" kpx2="959"/><pair kern="-19" kpx2="958"/><pair kern="-19" kpx2="948"/><pair kern="-19" kpx2="974"/><pair kern="-19" kpx2="952"/><pair kern="-71" kpx2="920"/><pair kern="-19" kpx2="966"/><pair kern="-19" kpx2="969"/><pair kern="-71" kpx2="934"/><pair kern="-19" kpx2="945"/></kerning><kerning kpx1="76"><pair kern="-55" kpx2="87"/><pair kern="-18" kpx2="160"/><pair kern="-74" kpx2="89"/><pair kern="-74" kpx2="84"/><pair kern="-55" kpx2="86"/><pair kern="-74" kpx2="8217"/></kerning><kerning kpx1="936"><pair kern="-20" kpx2="972"/><pair kern="-20" kpx2="940"/><pair kern="-27" kpx2="948"/><pair kern="-20" kpx2="974"/><pair kern="-20" kpx2="963"/><pair kern="-17" kpx2="952"/><pair kern="-20" kpx2="966"/><pair kern="-20" kpx2="969"/><pair kern="-20" kpx2="959"/><pair kern="-20" kpx2="945"/></kerning><kerning kpx1="1090"><pair kern="-13" kpx2="1086"/><pair kern="-13" kpx2="1089"/><pair kern="-13" kpx2="1077"/><pair kern="-24" kpx2="1101"/><pair kern="-24" kpx2="1079"/><pair kern="-24" kpx2="1091"/><pair kern="-13" kpx2="1084"/><pair kern="-13" kpx2="1076"/><pair kern="-13" kpx2="46"/><pair kern="-13" kpx2="1078"/><pair kern="-13" kpx2="1083"/><pair kern="-13" kpx2="44"/></kerning><kerning kpx1="1082"><pair kern="12" kpx2="1101"/><pair kern="12" kpx2="1091"/><pair kern="12" kpx2="1072"/><pair kern="-13" kpx2="1095"/><pair kern="12" kpx2="1073"/><pair kern="24" kpx2="1083"/></kerning><kerning kpx1="1118"><pair kern="-13" kpx2="58"/><pair kern="-13" kpx2="894"/><pair kern="-38" kpx2="46"/><pair kern="-38" kpx2="44"/></kerning><kerning kpx1="1072"><pair kern="-13" kpx2="1101"/><pair kern="-13" kpx2="1091"/><pair kern="-38" kpx2="1095"/><pair kern="12" kpx2="1083"/></kerning><kerning kpx1="1100"><pair kern="-100" kpx2="1095"/><pair kern="-24" kpx2="1090"/></kerning><kerning kpx1="935"><pair kern="-34" kpx2="974"/><pair kern="-34" kpx2="969"/></kerning><kerning kpx1="1069"><pair kern="-38" kpx2="1071"/><pair kern="-24" kpx2="1047"/><pair kern="-24" kpx2="1051"/><pair kern="-13" kpx2="1044"/><pair kern="-24" kpx2="1061"/><pair kern="-24" kpx2="1046"/></kerning><kerning kpx1="955"><pair kern="-14" kpx2="972"/><pair kern="-14" kpx2="940"/><pair kern="-14" kpx2="950"/><pair kern="-14" kpx2="963"/><pair kern="-19" kpx2="971"/><pair kern="-19" kpx2="944"/><pair kern="-14" kpx2="959"/><pair kern="-14" kpx2="958"/><pair kern="-19" kpx2="965"/><pair kern="-14" kpx2="948"/><pair kern="-14" kpx2="974"/><pair kern="-14" kpx2="966"/><pair kern="-14" kpx2="969"/><pair kern="-19" kpx2="973"/><pair kern="-14" kpx2="945"/><pair kern="-14" kpx2="962"/></kerning><kerning kpx1="1033"><pair kern="-100" kpx2="8217"/></kerning><kerning kpx1="1034"><pair kern="-100" kpx2="8217"/></kerning><kerning kpx1="80"><pair kern="-74" kpx2="65"/><pair kern="-37" kpx2="160"/><pair kern="-128" kpx2="46"/><pair kern="-128" kpx2="44"/></kerning><kerning kpx1="8222"><pair kern="-125" kpx2="1035"/><pair kern="-112" kpx2="1026"/><pair kern="-100" kpx2="1066"/><pair kern="-62" kpx2="1063"/><pair kern="-112" kpx2="1058"/></kerning><kerning kpx1="1089"><pair kern="-13" kpx2="1093"/><pair kern="-13" kpx2="1079"/><pair kern="-13" kpx2="1091"/><pair kern="-24" kpx2="1098"/><pair kern="-38" kpx2="1095"/><pair kern="-13" kpx2="1078"/><pair kern="-13" kpx2="1092"/></kerning><kerning kpx1="910"><pair kern="-37" kpx2="972"/><pair kern="-55" kpx2="923"/><pair kern="-37" kpx2="940"/><pair kern="-37" kpx2="963"/><pair kern="-37" kpx2="951"/><pair kern="-37" kpx2="954"/><pair kern="-37" kpx2="959"/><pair kern="129" kpx2="912"/><pair kern="-37" kpx2="943"/><pair kern="-37" kpx2="953"/><pair kern="63" kpx2="970"/><pair kern="-37" kpx2="948"/><pair kern="-65" kpx2="916"/><pair kern="-37" kpx2="942"/><pair kern="-37" kpx2="956"/><pair kern="-37" kpx2="966"/><pair kern="-37" kpx2="945"/><pair kern="-88" kpx2="913"/></kerning><kerning kpx1="70"><pair kern="-55" kpx2="65"/><pair kern="-110" kpx2="46"/><pair kern="-110" kpx2="44"/></kerning><kerning kpx1="966"><pair kern="-17" kpx2="960"/><pair kern="-27" kpx2="955"/><pair kern="-27" kpx2="967"/><pair kern="-18" kpx2="947"/></kerning><kerning kpx1="1094"><pair kern="-38" kpx2="1086"/><pair kern="-38" kpx2="1089"/><pair kern="-38" kpx2="1077"/><pair kern="-13" kpx2="1079"/><pair kern="-13" kpx2="1091"/><pair kern="-13" kpx2="1072"/></kerning><kerning kpx1="8216"><pair kern="-37" kpx2="8216"/></kerning><kerning kpx1="1070"><pair kern="-38" kpx2="1040"/><pair kern="-13" kpx2="1061"/><pair kern="-24" kpx2="1046"/><pair kern="12" kpx2="1063"/><pair kern="-50" kpx2="1058"/></kerning><kerning kpx1="1092"><pair kern="-24" kpx2="1091"/><pair kern="-38" kpx2="1095"/></kerning><kerning kpx1="933"><pair kern="-37" kpx2="972"/><pair kern="-37" kpx2="940"/><pair kern="-55" kpx2="923"/><pair kern="-55" kpx2="58"/><pair kern="-37" kpx2="963"/><pair kern="-37" kpx2="951"/><pair kern="-37" kpx2="954"/><pair kern="-37" kpx2="959"/><pair kern="129" kpx2="912"/><pair kern="-37" kpx2="943"/><pair kern="-20" kpx2="947"/><pair kern="-90" kpx2="44"/><pair kern="-37" kpx2="953"/><pair kern="-74" kpx2="173"/><pair kern="63" kpx2="970"/><pair kern="-37" kpx2="948"/><pair kern="-65" kpx2="916"/><pair kern="-55" kpx2="894"/><pair kern="-37" kpx2="942"/><pair kern="-37" kpx2="956"/><pair kern="-37" kpx2="966"/><pair kern="-90" kpx2="46"/><pair kern="-37" kpx2="945"/><pair kern="-88" kpx2="913"/></kerning><kerning kpx1="102"><pair kern="-18" kpx2="102"/><pair kern="18" kpx2="8217"/></kerning><kerning kpx1="1074"><pair kern="-24" kpx2="1077"/><pair kern="-24" kpx2="1084"/><pair kern="-62" kpx2="1098"/><pair kern="-24" kpx2="1076"/><pair kern="-13" kpx2="1090"/><pair kern="-24" kpx2="1092"/><pair kern="-13" kpx2="1103"/><pair kern="-24" kpx2="1086"/><pair kern="-24" kpx2="1089"/><pair kern="-13" kpx2="1079"/><pair kern="-38" kpx2="1091"/><pair kern="-13" kpx2="1072"/><pair kern="-49" kpx2="1095"/><pair kern="-13" kpx2="1078"/><pair kern="-24" kpx2="1073"/></kerning><kerning kpx1="84"><pair kern="-37" kpx2="111"/><pair kern="-18" kpx2="79"/><pair kern="-37" kpx2="119"/><pair kern="-74" kpx2="58"/><pair kern="-18" kpx2="114"/><pair kern="-37" kpx2="99"/><pair kern="-74" kpx2="44"/><pair kern="-18" kpx2="105"/><pair kern="-55" kpx2="173"/><pair kern="-74" kpx2="65"/><pair kern="-37" kpx2="97"/><pair kern="-74" kpx2="894"/><pair kern="-18" kpx2="117"/><pair kern="-37" kpx2="121"/><pair kern="-74" kpx2="46"/><pair kern="-37" kpx2="115"/><pair kern="-37" kpx2="101"/></kerning><kerning kpx1="934"><pair kern="-54" kpx2="933"/><pair kern="-54" kpx2="939"/><pair kern="-27" kpx2="913"/></kerning><kerning kpx1="1073"><pair kern="-24" kpx2="1093"/><pair kern="-13" kpx2="1101"/><pair kern="-13" kpx2="1079"/><pair kern="-24" kpx2="1091"/><pair kern="-13" kpx2="1084"/><pair kern="-50" kpx2="1098"/><pair kern="-38" kpx2="1095"/><pair kern="-13" kpx2="1078"/><pair kern="-13" kpx2="1083"/></kerning><kerning kpx1="1056"><pair kern="-13" kpx2="1077"/><pair kern="-13" kpx2="58"/><pair kern="-13" kpx2="1076"/><pair kern="-38" kpx2="1044"/><pair kern="-38" kpx2="1061"/><pair kern="-24" kpx2="187"/><pair kern="-38" kpx2="1058"/><pair kern="-125" kpx2="44"/><pair kern="-13" kpx2="1086"/><pair kern="-24" kpx2="1071"/><pair kern="-13" kpx2="894"/><pair kern="-38" kpx2="1047"/><pair kern="-62" kpx2="1040"/><pair kern="-24" kpx2="1051"/><pair kern="-125" kpx2="46"/><pair kern="-38" kpx2="1059"/><pair kern="-38" kpx2="1046"/></kerning><kerning kpx1="1077"><pair kern="-13" kpx2="1093"/><pair kern="12" kpx2="1086"/><pair kern="12" kpx2="1089"/><pair kern="-13" kpx2="1091"/><pair kern="12" kpx2="1072"/><pair kern="12" kpx2="1076"/><pair kern="-24" kpx2="1095"/><pair kern="-13" kpx2="1078"/><pair kern="12" kpx2="1092"/><pair kern="12" kpx2="1073"/><pair kern="12" kpx2="1083"/></kerning><kerning kpx1="1066"><pair kern="-24" kpx2="1071"/><pair kern="-100" kpx2="8217"/></kerning><kerning kpx1="49"><pair kern="-74" kpx2="49"/></kerning><kerning kpx1="916"><pair kern="-123" kpx2="933"/><pair kern="-37" kpx2="160"/><pair kern="-20" kpx2="920"/><pair kern="-123" kpx2="939"/><pair kern="-20" kpx2="927"/><pair kern="-91" kpx2="932"/></kerning><kerning kpx1="1042"><pair kern="-13" kpx2="1093"/><pair kern="-62" kpx2="1066"/><pair kern="-38" kpx2="1061"/><pair kern="-62" kpx2="1058"/><pair kern="-24" kpx2="1054"/><pair kern="-24" kpx2="1071"/><pair kern="-38" kpx2="1060"/><pair kern="-13" kpx2="1091"/><pair kern="-24" kpx2="1047"/><pair kern="-24" kpx2="1057"/><pair kern="-38" kpx2="1040"/><pair kern="-62" kpx2="1059"/><pair kern="-38" kpx2="1095"/><pair kern="-24" kpx2="1046"/></kerning><kerning kpx1="902"><pair kern="-28" kpx2="967"/><pair kern="-123" kpx2="933"/><pair kern="-28" kpx2="957"/><pair kern="-37" kpx2="160"/><pair kern="-57" kpx2="920"/><pair kern="-123" kpx2="939"/><pair kern="-57" kpx2="927"/><pair kern="-57" kpx2="934"/><pair kern="-91" kpx2="932"/><pair kern="-28" kpx2="947"/></kerning><kerning kpx1="1078"><pair kern="12" kpx2="1091"/><pair kern="12" kpx2="1072"/><pair kern="12" kpx2="1098"/><pair kern="-13" kpx2="1095"/><pair kern="12" kpx2="1073"/></kerning><kerning kpx1="1068"><pair kern="-38" kpx2="1069"/><pair kern="-38" kpx2="1071"/><pair kern="-38" kpx2="1054"/><pair kern="-38" kpx2="1057"/><pair kern="-13" kpx2="1052"/><pair kern="-24" kpx2="1047"/><pair kern="-24" kpx2="1040"/><pair kern="-24" kpx2="1061"/><pair kern="-24" kpx2="1046"/><pair kern="-38" kpx2="1063"/><pair kern="-100" kpx2="1058"/><pair kern="-87" kpx2="8217"/></kerning><kerning kpx1="1168"><pair kern="-24" kpx2="46"/><pair kern="-24" kpx2="44"/></kerning><kerning kpx1="1093"><pair kern="-24" kpx2="1086"/><pair kern="-24" kpx2="1089"/><pair kern="-24" kpx2="1077"/><pair kern="-13" kpx2="1101"/><pair kern="-13" kpx2="1079"/><pair kern="-13" kpx2="1072"/><pair kern="-24" kpx2="1095"/><pair kern="-24" kpx2="1092"/><pair kern="-13" kpx2="1073"/></kerning><kerning kpx1="1065"><pair kern="24" kpx2="1091"/><pair kern="24" kpx2="1072"/></kerning><kerning kpx1="1076"><pair kern="-13" kpx2="1079"/></kerning><kerning kpx1="1102"><pair kern="-24" kpx2="1093"/><pair kern="-13" kpx2="1077"/><pair kern="-24" kpx2="1101"/><pair kern="-13" kpx2="1084"/><pair kern="-13" kpx2="1076"/><pair kern="-13" kpx2="1090"/><pair kern="-13" kpx2="1092"/><pair kern="-13" kpx2="1086"/><pair kern="-13" kpx2="1089"/><pair kern="-62" kpx2="1095"/><pair kern="-24" kpx2="1078"/><pair kern="-13" kpx2="1073"/><pair kern="-13" kpx2="1083"/></kerning><kerning kpx1="1044"><pair kern="-13" kpx2="1060"/><pair kern="12" kpx2="1079"/><pair kern="24" kpx2="1091"/><pair kern="24" kpx2="1063"/></kerning><kerning kpx1="1043"><pair kern="-24" kpx2="1088"/><pair kern="-49" kpx2="1077"/><pair kern="-24" kpx2="1084"/><pair kern="-24" kpx2="1085"/><pair kern="-13" kpx2="1076"/><pair kern="-24" kpx2="1102"/><pair kern="-24" kpx2="1044"/><pair kern="-38" kpx2="1080"/><pair kern="-62" kpx2="44"/><pair kern="-24" kpx2="1103"/><pair kern="-49" kpx2="1086"/><pair kern="-13" kpx2="1054"/><pair kern="-13" kpx2="1071"/><pair kern="-24" kpx2="1099"/><pair kern="-24" kpx2="1091"/><pair kern="-13" kpx2="1047"/><pair kern="-50" kpx2="1074"/><pair kern="-13" kpx2="1072"/><pair kern="-50" kpx2="1040"/><pair kern="-13" kpx2="1051"/><pair kern="-24" kpx2="1100"/><pair kern="-62" kpx2="46"/><pair kern="-38" kpx2="1083"/></kerning><kerning kpx1="8217"><pair kern="-37" kpx2="160"/><pair kern="18" kpx2="116"/><pair kern="-18" kpx2="115"/><pair kern="-37" kpx2="8217"/></kerning><kerning kpx1="1054"><pair kern="12" kpx2="1103"/><pair kern="-24" kpx2="1071"/><pair kern="12" kpx2="1084"/><pair kern="-13" kpx2="1051"/><pair kern="-38" kpx2="1040"/><pair kern="-62" kpx2="1059"/><pair kern="-13" kpx2="1044"/><pair kern="-24" kpx2="1061"/><pair kern="-38" kpx2="1046"/><pair kern="24" kpx2="1063"/></kerning><kerning kpx1="1075"><pair kern="-13" kpx2="1103"/><pair kern="-24" kpx2="1086"/><pair kern="-24" kpx2="1089"/><pair kern="-24" kpx2="1077"/><pair kern="-24" kpx2="1079"/><pair kern="-24" kpx2="1084"/><pair kern="-13" kpx2="1072"/><pair kern="-38" kpx2="1076"/><pair kern="-13" kpx2="46"/><pair kern="-13" kpx2="44"/></kerning><kerning kpx1="948"><pair kern="-17" kpx2="960"/><pair kern="-27" kpx2="967"/><pair kern="-18" kpx2="947"/></kerning><kerning kpx1="89"><pair kern="-37" kpx2="111"/><pair kern="-55" kpx2="58"/><pair kern="-37" kpx2="112"/><pair kern="-37" kpx2="113"/><pair kern="-37" kpx2="118"/><pair kern="-91" kpx2="44"/><pair kern="-37" kpx2="105"/><pair kern="-74" kpx2="173"/><pair kern="-74" kpx2="65"/><pair kern="-37" kpx2="97"/><pair kern="-18" kpx2="160"/><pair kern="-55" kpx2="894"/><pair kern="-37" kpx2="117"/><pair kern="-91" kpx2="46"/><pair kern="-37" kpx2="101"/></kerning></font-metrics>
\ No newline at end of file
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/ariali.ttf b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/ariali.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..a203d60ecc9f3092ec27635d17b9883a7c18c301
Binary files /dev/null and b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/ariali.ttf differ
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/ariali.xml b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/ariali.xml
new file mode 100755
index 0000000000000000000000000000000000000000..d95bfeac61eebd26170ff459d87950ca15a2b93b
--- /dev/null
+++ b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/ariali.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><font-metrics metrics-version="2" type="TYPE0"><font-name>Arial,Italic</font-name><embed/><cap-height>715</cap-height><x-height>518</x-height><ascender>728</ascender><descender>-207</descender><bbox><left>-517</left><bottom>-324</bottom><right>1081</right><top>1024</top></bbox><flags>96</flags><stemv>0</stemv><italicangle>-12</italicangle><subtype>TYPE0</subtype><multibyte-extras><cid-type>CIDFontType2</cid-type><default-width>0</default-width><bfranges><bf gi="3" ue="126" us="32"/><bf gi="3" ue="160" us="160"/><bf gi="163" ue="161" us="161"/><bf gi="132" ue="163" us="162"/><bf gi="764" ue="164" us="164"/><bf gi="150" ue="165" us="165"/><bf gi="230" ue="166" us="166"/><bf gi="134" ue="167" us="167"/><bf gi="142" ue="168" us="168"/><bf gi="139" ue="169" us="169"/><bf gi="157" ue="170" us="170"/><bf gi="169" ue="171" us="171"/><bf gi="164" ue="172" us="172"/><bf gi="16" ue="173" us="173"/><bf gi="138" ue="174" us="174"/><bf gi="256" ue="175" us="175"/><bf gi="131" ue="176" us="176"/><bf gi="147" ue="177" us="177"/><bf gi="240" ue="179" us="178"/><bf gi="141" ue="180" us="180"/><bf gi="151" ue="181" us="181"/><bf gi="136" ue="182" us="182"/><bf gi="194" ue="183" us="183"/><bf gi="220" ue="184" us="184"/><bf gi="239" ue="185" us="185"/><bf gi="158" ue="186" us="186"/><bf gi="170" ue="187" us="187"/><bf gi="243" ue="188" us="188"/><bf gi="242" ue="189" us="189"/><bf gi="244" ue="190" us="190"/><bf gi="162" ue="191" us="191"/><bf gi="172" ue="192" us="192"/><bf gi="200" ue="193" us="193"/><bf gi="198" ue="194" us="194"/><bf gi="173" ue="195" us="195"/><bf gi="98" ue="197" us="196"/><bf gi="144" ue="198" us="198"/><bf gi="100" ue="199" us="199"/><bf gi="202" ue="200" us="200"/><bf gi="101" ue="201" us="201"/><bf gi="199" ue="202" us="202"/><bf gi="201" ue="203" us="203"/><bf gi="206" ue="204" us="204"/><bf gi="203" ue="207" us="205"/><bf gi="231" ue="208" us="208"/><bf gi="102" ue="209" us="209"/><bf gi="209" ue="210" us="210"/><bf gi="207" ue="212" us="211"/><bf gi="174" ue="213" us="213"/><bf gi="103" ue="214" us="214"/><bf gi="238" ue="215" us="215"/><bf gi="145" ue="216" us="216"/><bf gi="212" ue="217" us="217"/><bf gi="210" ue="219" us="218"/><bf gi="104" ue="220" us="220"/><bf gi="233" ue="221" us="221"/><bf gi="235" ue="222" us="222"/><bf gi="137" ue="223" us="223"/><bf gi="106" ue="224" us="224"/><bf gi="105" ue="225" us="225"/><bf gi="107" ue="226" us="226"/><bf gi="109" ue="227" us="227"/><bf gi="108" ue="228" us="228"/><bf gi="110" ue="229" us="229"/><bf gi="160" ue="230" us="230"/><bf gi="111" ue="231" us="231"/><bf gi="113" ue="232" us="232"/><bf gi="112" ue="233" us="233"/><bf gi="114" ue="235" us="234"/><bf gi="117" ue="236" us="236"/><bf gi="116" ue="237" us="237"/><bf gi="118" ue="239" us="238"/><bf gi="232" ue="240" us="240"/><bf gi="120" ue="241" us="241"/><bf gi="122" ue="242" us="242"/><bf gi="121" ue="243" us="243"/><bf gi="123" ue="244" us="244"/><bf gi="125" ue="245" us="245"/><bf gi="124" ue="246" us="246"/><bf gi="183" ue="247" us="247"/><bf gi="161" ue="248" us="248"/><bf gi="127" ue="249" us="249"/><bf gi="126" ue="250" us="250"/><bf gi="128" ue="252" us="251"/><bf gi="234" ue="253" us="253"/><bf gi="236" ue="254" us="254"/><bf gi="185" ue="255" us="255"/><bf gi="406" ue="257" us="256"/><bf gi="258" ue="261" us="258"/><bf gi="251" ue="263" us="262"/><bf gi="408" ue="267" us="264"/><bf gi="253" ue="269" us="268"/><bf gi="262" ue="272" us="270"/><bf gi="255" ue="273" us="273"/><bf gi="412" ue="279" us="274"/><bf gi="265" ue="283" us="280"/><bf gi="418" ue="285" us="284"/><bf gi="246" ue="287" us="286"/><bf gi="420" ue="303" us="288"/><bf gi="248" ue="304" us="304"/><bf gi="213" ue="305" us="305"/><bf gi="394" ue="307" us="306"/><bf gi="436" ue="312" us="308"/><bf gi="269" ue="314" us="313"/><bf gi="441" ue="316" us="315"/><bf gi="271" ue="320" us="317"/><bf gi="224" ue="322" us="321"/><bf gi="275" ue="324" us="323"/><bf gi="443" ue="326" us="325"/><bf gi="277" ue="328" us="327"/><bf gi="396" ue="329" us="329"/><bf gi="445" ue="335" us="330"/><bf gi="279" ue="337" us="336"/><bf gi="175" ue="339" us="338"/><bf gi="281" ue="341" us="340"/><bf gi="451" ue="343" us="342"/><bf gi="283" ue="347" us="344"/><bf gi="453" ue="349" us="348"/><bf gi="249" ue="351" us="350"/><bf gi="226" ue="353" us="352"/><bf gi="287" ue="357" us="354"/><bf gi="455" ue="365" us="358"/><bf gi="291" ue="369" us="366"/><bf gi="463" ue="375" us="370"/><bf gi="186" ue="376" us="376"/><bf gi="295" ue="380" us="377"/><bf gi="228" ue="382" us="381"/><bf gi="469" ue="383" us="383"/><bf gi="166" ue="402" us="402"/><bf gi="766" ue="417" us="416"/><bf gi="768" ue="432" us="431"/><bf gi="912" ue="476" us="461"/><bf gi="470" ue="511" us="506"/><bf gi="214" ue="710" us="710"/><bf gi="223" ue="711" us="711"/><bf gi="216" ue="713" us="713"/><bf gi="217" ue="730" us="728"/><bf gi="222" ue="731" us="731"/><bf gi="215" ue="732" us="732"/><bf gi="221" ue="733" us="733"/><bf gi="806" ue="769" us="768"/><bf gi="782" ue="771" us="771"/><bf gi="776" ue="777" us="777"/><bf gi="809" ue="803" us="803"/><bf gi="30" ue="894" us="894"/><bf gi="495" ue="902" us="900"/><bf gi="476" ue="903" us="903"/><bf gi="498" ue="906" us="904"/><bf gi="501" ue="908" us="908"/><bf gi="502" ue="914" us="910"/><bf gi="299" ue="915" us="915"/><bf gi="507" ue="919" us="916"/><bf gi="300" ue="920" us="920"/><bf gi="511" ue="929" us="921"/><bf gi="520" ue="933" us="931"/><bf gi="301" ue="934" us="934"/><bf gi="523" ue="944" us="935"/><bf gi="302" ue="945" us="945"/><bf gi="533" ue="947" us="946"/><bf gi="303" ue="949" us="948"/><bf gi="535" ue="959" us="950"/><bf gi="652" ue="960" us="960"/><bf gi="545" ue="962" us="961"/><bf gi="305" ue="964" us="963"/><bf gi="547" ue="965" us="965"/><bf gi="307" ue="966" us="966"/><bf gi="548" ue="974" us="967"/><bf gi="556" ue="1036" us="1025"/><bf gi="568" ue="1103" us="1038"/><bf gi="634" ue="1116" us="1105"/><bf gi="646" ue="1119" us="1118"/><bf gi="648" ue="1169" us="1168"/><bf gi="653" ue="1465" us="1456"/><bf gi="663" ue="1475" us="1467"/><bf gi="672" ue="1514" us="1488"/><bf gi="699" ue="1524" us="1520"/><bf gi="477" ue="7813" us="7808"/><bf gi="824" ue="7921" us="7840"/><bf gi="483" ue="7923" us="7922"/><bf gi="906" ue="7929" us="7924"/><bf gi="744" ue="8207" us="8204"/><bf gi="177" ue="8212" us="8211"/><bf gi="650" ue="8213" us="8213"/><bf gi="308" ue="8215" us="8215"/><bf gi="181" ue="8217" us="8216"/><bf gi="195" ue="8218" us="8218"/><bf gi="485" ue="8219" us="8219"/><bf gi="179" ue="8221" us="8220"/><bf gi="196" ue="8222" us="8222"/><bf gi="130" ue="8224" us="8224"/><bf gi="193" ue="8225" us="8225"/><bf gi="135" ue="8226" us="8226"/><bf gi="171" ue="8230" us="8230"/><bf gi="748" ue="8235" us="8234"/><bf gi="752" ue="8236" us="8236"/><bf gi="750" ue="8238" us="8237"/><bf gi="197" ue="8240" us="8240"/><bf gi="397" ue="8243" us="8242"/><bf gi="189" ue="8250" us="8249"/><bf gi="309" ue="8252" us="8252"/><bf gi="486" ue="8254" us="8254"/><bf gi="187" ue="8260" us="8260"/><bf gi="755" ue="8301" us="8298"/><bf gi="753" ue="8303" us="8302"/><bf gi="310" ue="8319" us="8319"/><bf gi="245" ue="8355" us="8355"/><bf gi="487" ue="8356" us="8356"/><bf gi="311" ue="8359" us="8359"/><bf gi="704" ue="8362" us="8362"/><bf gi="786" ue="8363" us="8363"/><bf gi="188" ue="8364" us="8364"/><bf gi="399" ue="8453" us="8453"/><bf gi="400" ue="8467" us="8467"/><bf gi="651" ue="8470" us="8470"/><bf gi="140" ue="8482" us="8482"/><bf gi="159" ue="8486" us="8486"/><bf gi="488" ue="8494" us="8494"/><bf gi="787" ue="8532" us="8531"/><bf gi="489" ue="8542" us="8539"/><bf gi="312" ue="8597" us="8592"/><bf gi="318" ue="8616" us="8616"/><bf gi="152" ue="8706" us="8706"/><bf gi="168" ue="8710" us="8710"/><bf gi="154" ue="8719" us="8719"/><bf gi="153" ue="8721" us="8721"/><bf gi="237" ue="8722" us="8722"/><bf gi="187" ue="8725" us="8725"/><bf gi="194" ue="8729" us="8729"/><bf gi="165" ue="8730" us="8730"/><bf gi="146" ue="8734" us="8734"/><bf gi="319" ue="8735" us="8735"/><bf gi="320" ue="8745" us="8745"/><bf gi="156" ue="8747" us="8747"/><bf gi="167" ue="8776" us="8776"/><bf gi="143" ue="8800" us="8800"/><bf gi="321" ue="8801" us="8801"/><bf gi="148" ue="8805" us="8804"/><bf gi="322" ue="8962" us="8962"/><bf gi="323" ue="8976" us="8976"/><bf gi="324" ue="8993" us="8992"/><bf gi="326" ue="9472" us="9472"/><bf gi="327" ue="9474" us="9474"/><bf gi="328" ue="9484" us="9484"/><bf gi="329" ue="9488" us="9488"/><bf gi="330" ue="9492" us="9492"/><bf gi="331" ue="9496" us="9496"/><bf gi="332" ue="9500" us="9500"/><bf gi="333" ue="9508" us="9508"/><bf gi="334" ue="9516" us="9516"/><bf gi="335" ue="9524" us="9524"/><bf gi="336" ue="9532" us="9532"/><bf gi="337" ue="9580" us="9552"/><bf gi="366" ue="9600" us="9600"/><bf gi="367" ue="9604" us="9604"/><bf gi="368" ue="9608" us="9608"/><bf gi="369" ue="9612" us="9612"/><bf gi="370" ue="9619" us="9616"/><bf gi="374" ue="9632" us="9632"/><bf gi="401" ue="9633" us="9633"/><bf gi="402" ue="9643" us="9642"/><bf gi="375" ue="9644" us="9644"/><bf gi="376" ue="9650" us="9650"/><bf gi="377" ue="9658" us="9658"/><bf gi="378" ue="9660" us="9660"/><bf gi="379" ue="9668" us="9668"/><bf gi="184" ue="9674" us="9674"/><bf gi="380" ue="9675" us="9675"/><bf gi="404" ue="9679" us="9679"/><bf gi="381" ue="9689" us="9688"/><bf gi="405" ue="9702" us="9702"/><bf gi="383" ue="9788" us="9786"/><bf gi="386" ue="9792" us="9792"/><bf gi="387" ue="9794" us="9794"/><bf gi="388" ue="9824" us="9824"/><bf gi="389" ue="9827" us="9827"/><bf gi="390" ue="9830" us="9829"/><bf gi="392" ue="9835" us="9834"/><bf gi="705" ue="59397" us="59393"/><bf gi="191" ue="61442" us="61441"/><bf gi="493" ue="61445" us="61444"/><bf gi="773" ue="61447" us="61446"/><bf gi="789" ue="61448" us="61448"/><bf gi="775" ue="61449" us="61449"/><bf gi="759" ue="61454" us="61450"/><bf gi="792" ue="61455" us="61455"/><bf gi="777" ue="61456" us="61456"/><bf gi="779" ue="61457" us="61457"/><bf gi="793" ue="61458" us="61458"/><bf gi="778" ue="61459" us="61459"/><bf gi="794" ue="61460" us="61460"/><bf gi="781" ue="61461" us="61461"/><bf gi="795" ue="61467" us="61462"/><bf gi="780" ue="61468" us="61468"/><bf gi="808" ue="61469" us="61469"/><bf gi="801" ue="61474" us="61470"/><bf gi="810" ue="61475" us="61475"/><bf gi="814" ue="61480" us="61476"/><bf gi="811" ue="61483" us="61481"/><bf gi="785" ue="61484" us="61484"/><bf gi="819" ue="61489" us="61485"/><bf gi="191" ue="64258" us="64257"/><bf gi="710" ue="64288" us="64288"/><bf gi="711" ue="64310" us="64298"/><bf gi="724" ue="64316" us="64312"/><bf gi="729" ue="64318" us="64318"/><bf gi="730" ue="64321" us="64320"/><bf gi="732" ue="64324" us="64323"/><bf gi="734" ue="64335" us="64326"/><bf gi="765" ue="65532" us="65532"/><bf gi="0" ue="65535" us="65535"/></bfranges><cid-widths start-index="0"><wx w="750"/><wx w="0"/><wx w="277"/><wx w="277"/><wx w="277"/><wx w="354"/><wx w="556"/><wx w="556"/><wx w="889"/><wx w="666"/><wx w="190"/><wx w="333"/><wx w="333"/><wx w="389"/><wx w="583"/><wx w="277"/><wx w="333"/><wx w="277"/><wx w="277"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="277"/><wx w="277"/><wx w="583"/><wx w="583"/><wx w="583"/><wx w="556"/><wx w="1015"/><wx w="666"/><wx w="666"/><wx w="722"/><wx w="722"/><wx w="666"/><wx w="610"/><wx w="777"/><wx w="722"/><wx w="277"/><wx w="500"/><wx w="666"/><wx w="556"/><wx w="833"/><wx w="722"/><wx w="777"/><wx w="666"/><wx w="777"/><wx w="722"/><wx w="666"/><wx w="610"/><wx w="722"/><wx w="666"/><wx w="943"/><wx w="666"/><wx w="666"/><wx w="610"/><wx w="277"/><wx w="277"/><wx w="277"/><wx w="469"/><wx w="556"/><wx w="333"/><wx w="556"/><wx w="556"/><wx w="500"/><wx w="556"/><wx w="556"/><wx w="277"/><wx w="556"/><wx w="556"/><wx w="222"/><wx w="222"/><wx w="500"/><wx w="222"/><wx w="833"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="333"/><wx w="500"/><wx w="277"/><wx w="556"/><wx w="500"/><wx w="722"/><wx w="500"/><wx w="500"/><wx w="500"/><wx w="333"/><wx w="259"/><wx w="333"/><wx w="583"/><wx w="666"/><wx w="666"/><wx w="722"/><wx w="666"/><wx w="722"/><wx w="777"/><wx w="722"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="500"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="277"/><wx w="277"/><wx w="277"/><wx w="277"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="399"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="350"/><wx w="537"/><wx w="610"/><wx w="736"/><wx w="736"/><wx w="1000"/><wx w="333"/><wx w="333"/><wx w="548"/><wx w="1000"/><wx w="777"/><wx w="712"/><wx w="548"/><wx w="548"/><wx w="548"/><wx w="556"/><wx w="576"/><wx w="494"/><wx w="712"/><wx w="823"/><wx w="548"/><wx w="273"/><wx w="370"/><wx w="365"/><wx w="768"/><wx w="889"/><wx w="610"/><wx w="610"/><wx w="333"/><wx w="583"/><wx w="548"/><wx w="556"/><wx w="548"/><wx w="611"/><wx w="556"/><wx w="556"/><wx w="1000"/><wx w="666"/><wx w="666"/><wx w="777"/><wx w="1000"/><wx w="943"/><wx w="556"/><wx w="1000"/><wx w="333"/><wx w="333"/><wx w="222"/><wx w="222"/><wx w="548"/><wx w="494"/><wx w="500"/><wx w="666"/><wx w="166"/><wx w="556"/><wx w="333"/><wx w="333"/><wx w="500"/><wx w="500"/><wx w="556"/><wx w="277"/><wx w="222"/><wx w="333"/><wx w="1000"/><wx w="666"/><wx w="666"/><wx w="666"/><wx w="666"/><wx w="666"/><wx w="277"/><wx w="277"/><wx w="277"/><wx w="277"/><wx w="777"/><wx w="777"/><wx w="777"/><wx w="722"/><wx w="722"/><wx w="722"/><wx w="277"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="556"/><wx w="222"/><wx w="666"/><wx w="500"/><wx w="610"/><wx w="500"/><wx w="259"/><wx w="722"/><wx w="556"/><wx w="666"/><wx w="500"/><wx w="666"/><wx w="556"/><wx w="583"/><wx w="583"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="833"/><wx w="833"/><wx w="833"/><wx w="556"/><wx w="777"/><wx w="556"/><wx w="277"/><wx w="666"/><wx w="500"/><wx w="722"/><wx w="500"/><wx w="722"/><wx w="500"/><wx w="556"/><wx w="552"/><wx w="333"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="722"/><wx w="625"/><wx w="722"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="556"/><wx w="222"/><wx w="556"/><wx w="281"/><wx w="556"/><wx w="399"/><wx w="722"/><wx w="556"/><wx w="722"/><wx w="556"/><wx w="777"/><wx w="556"/><wx w="722"/><wx w="333"/><wx w="722"/><wx w="333"/><wx w="666"/><wx w="500"/><wx w="610"/><wx w="277"/><wx w="610"/><wx w="354"/><wx w="722"/><wx w="556"/><wx w="722"/><wx w="556"/><wx w="610"/><wx w="500"/><wx w="610"/><wx w="500"/><wx w="570"/><wx w="777"/><wx w="836"/><wx w="570"/><wx w="555"/><wx w="439"/><wx w="603"/><wx w="374"/><wx w="652"/><wx w="552"/><wx w="500"/><wx w="364"/><wx w="1093"/><wx w="1000"/><wx w="500"/><wx w="1000"/><wx w="500"/><wx w="1000"/><wx w="500"/><wx w="500"/><wx w="979"/><wx w="718"/><wx w="583"/><wx w="604"/><wx w="583"/><wx w="604"/><wx w="604"/><wx w="708"/><wx w="625"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="729"/><wx w="604"/><wx w="1000"/><wx w="989"/><wx w="989"/><wx w="989"/><wx w="989"/><wx w="604"/><wx w="604"/><wx w="604"/><wx w="1020"/><wx w="1052"/><wx w="916"/><wx w="750"/><wx w="750"/><wx w="531"/><wx w="656"/><wx w="593"/><wx w="510"/><wx w="500"/><wx w="750"/><wx w="733"/><wx w="443"/><wx w="614"/><wx w="187"/><wx w="354"/><wx w="885"/><wx w="323"/><wx w="604"/><wx w="354"/><wx w="354"/><wx w="604"/><wx w="354"/><wx w="666"/><wx w="556"/><wx w="722"/><wx w="500"/><wx w="722"/><wx w="500"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="777"/><wx w="556"/><wx w="777"/><wx w="556"/><wx w="777"/><wx w="556"/><wx w="722"/><wx w="556"/><wx w="722"/><wx w="556"/><wx w="277"/><wx w="277"/><wx w="277"/><wx w="277"/><wx w="277"/><wx w="277"/><wx w="277"/><wx w="222"/><wx w="500"/><wx w="222"/><wx w="666"/><wx w="500"/><wx w="500"/><wx w="556"/><wx w="222"/><wx w="722"/><wx w="556"/><wx w="723"/><wx w="556"/><wx w="777"/><wx w="556"/><wx w="777"/><wx w="556"/><wx w="722"/><wx w="333"/><wx w="666"/><wx w="500"/><wx w="610"/><wx w="277"/><wx w="722"/><wx w="556"/><wx w="722"/><wx w="556"/><wx w="722"/><wx w="556"/><wx w="722"/><wx w="556"/><wx w="943"/><wx w="722"/><wx w="666"/><wx w="500"/><wx w="222"/><wx w="666"/><wx w="556"/><wx w="1000"/><wx w="889"/><wx w="777"/><wx w="610"/><wx w="277"/><wx w="943"/><wx w="722"/><wx w="943"/><wx w="722"/><wx w="943"/><wx w="722"/><wx w="666"/><wx w="500"/><wx w="222"/><wx w="333"/><wx w="556"/><wx w="600"/><wx w="833"/><wx w="833"/><wx w="833"/><wx w="833"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="666"/><wx w="788"/><wx w="846"/><wx w="388"/><wx w="793"/><wx w="865"/><wx w="774"/><wx w="222"/><wx w="666"/><wx w="666"/><wx w="670"/><wx w="666"/><wx w="610"/><wx w="722"/><wx w="277"/><wx w="666"/><wx w="666"/><wx w="833"/><wx w="722"/><wx w="648"/><wx w="777"/><wx w="724"/><wx w="666"/><wx w="599"/><wx w="610"/><wx w="666"/><wx w="666"/><wx w="830"/><wx w="760"/><wx w="277"/><wx w="666"/><wx w="570"/><wx w="439"/><wx w="555"/><wx w="222"/><wx w="549"/><wx w="571"/><wx w="500"/><wx w="463"/><wx w="555"/><wx w="542"/><wx w="222"/><wx w="500"/><wx w="492"/><wx w="547"/><wx w="500"/><wx w="446"/><wx w="556"/><wx w="572"/><wx w="486"/><wx w="549"/><wx w="545"/><wx w="727"/><wx w="778"/><wx w="222"/><wx w="549"/><wx w="556"/><wx w="549"/><wx w="778"/><wx w="666"/><wx w="842"/><wx w="543"/><wx w="707"/><wx w="666"/><wx w="277"/><wx w="277"/><wx w="500"/><wx w="1065"/><wx w="982"/><wx w="844"/><wx w="589"/><wx w="639"/><wx w="723"/><wx w="666"/><wx w="650"/><wx w="666"/><wx w="543"/><wx w="704"/><wx w="666"/><wx w="916"/><wx w="613"/><wx w="715"/><wx w="715"/><wx w="589"/><wx w="685"/><wx w="833"/><wx w="722"/><wx w="777"/><wx w="724"/><wx w="666"/><wx w="722"/><wx w="610"/><wx w="639"/><wx w="794"/><wx w="666"/><wx w="727"/><wx w="673"/><wx w="920"/><wx w="922"/><wx w="805"/><wx w="886"/><wx w="650"/><wx w="693"/><wx w="1022"/><wx w="681"/><wx w="556"/><wx w="562"/><wx w="521"/><wx w="493"/><wx w="552"/><wx w="556"/><wx w="687"/><wx w="464"/><wx w="556"/><wx w="556"/><wx w="472"/><wx w="563"/><wx w="685"/><wx w="550"/><wx w="556"/><wx w="550"/><wx w="556"/><wx w="500"/><wx w="833"/><wx w="500"/><wx w="835"/><wx w="500"/><wx w="571"/><wx w="517"/><wx w="830"/><wx w="851"/><wx w="621"/><wx w="735"/><wx w="525"/><wx w="491"/><wx w="751"/><wx w="534"/><wx w="556"/><wx w="556"/><wx w="377"/><wx w="495"/><wx w="500"/><wx w="222"/><wx w="222"/><wx w="222"/><wx w="910"/><wx w="827"/><wx w="556"/><wx w="472"/><wx w="500"/><wx w="556"/><wx w="492"/><wx w="339"/><wx w="1000"/><wx w="1083"/><wx w="669"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="333"/><wx w="382"/><wx w="333"/><wx w="274"/><wx w="333"/><wx w="333"/><wx w="277"/><wx w="562"/><wx w="541"/><wx w="398"/><wx w="508"/><wx w="602"/><wx w="246"/><wx w="382"/><wx w="598"/><wx w="589"/><wx w="246"/><wx w="509"/><wx w="460"/><wx w="462"/><wx w="598"/><wx w="601"/><wx w="246"/><wx w="352"/><wx w="574"/><wx w="529"/><wx w="566"/><wx w="546"/><wx w="461"/><wx w="478"/><wx w="549"/><wx w="509"/><wx w="694"/><wx w="642"/><wx w="493"/><wx w="493"/><wx w="493"/><wx w="235"/><wx w="416"/><wx w="815"/><wx w="246"/><wx w="509"/><wx w="509"/><wx w="462"/><wx w="462"/><wx w="535"/><wx w="694"/><wx w="694"/><wx w="694"/><wx w="694"/><wx w="562"/><wx w="562"/><wx w="562"/><wx w="541"/><wx w="398"/><wx w="508"/><wx w="602"/><wx w="286"/><wx w="411"/><wx w="589"/><wx w="286"/><wx w="509"/><wx w="460"/><wx w="462"/><wx w="601"/><wx w="352"/><wx w="574"/><wx w="566"/><wx w="546"/><wx w="478"/><wx w="549"/><wx w="509"/><wx w="694"/><wx w="642"/><wx w="246"/><wx w="541"/><wx w="460"/><wx w="546"/><wx w="575"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="556"/><wx w="1000"/><wx w="811"/><wx w="604"/><wx w="793"/><wx w="633"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="513"/><wx w="833"/><wx w="833"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="222"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="666"/><wx w="556"/><wx w="277"/><wx w="222"/><wx w="277"/><wx w="222"/><wx w="777"/><wx w="556"/><wx w="777"/><wx w="556"/><wx w="777"/><wx w="556"/><wx w="777"/><wx w="556"/><wx w="777"/><wx w="556"/><wx w="777"/><wx w="556"/><wx w="777"/><wx w="556"/><wx w="811"/><wx w="604"/><wx w="811"/><wx w="604"/><wx w="811"/><wx w="604"/><wx w="811"/><wx w="604"/><wx w="811"/><wx w="604"/><wx w="722"/><wx w="556"/><wx w="722"/><wx w="556"/><wx w="793"/><wx w="633"/><wx w="793"/><wx w="633"/><wx w="793"/><wx w="633"/><wx w="793"/><wx w="633"/><wx w="793"/><wx w="633"/><wx w="666"/><wx w="500"/><wx w="666"/><wx w="500"/><wx w="666"/><wx w="500"/><wx w="666"/><wx w="556"/><wx w="277"/><wx w="222"/><wx w="777"/><wx w="556"/><wx w="722"/><wx w="556"/><wx w="722"/><wx w="556"/><wx w="722"/><wx w="556"/><wx w="722"/><wx w="556"/><wx w="722"/><wx w="556"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/></cid-widths></multibyte-extras><kerning kpx1="972"><pair kern="-21" kpx2="960"/><pair kern="-28" kpx2="967"/><pair kern="-21" kpx2="964"/><pair kern="-18" kpx2="947"/></kerning><kerning kpx1="1088"><pair kern="-11" kpx2="1103"/><pair kern="-33" kpx2="1093"/><pair kern="-11" kpx2="1101"/><pair kern="-11" kpx2="1079"/><pair kern="-33" kpx2="1091"/><pair kern="-11" kpx2="1084"/><pair kern="-44" kpx2="1095"/><pair kern="-11" kpx2="1078"/><pair kern="-21" kpx2="1083"/></kerning><kerning kpx1="908"><pair kern="-54" kpx2="933"/><pair kern="-54" kpx2="939"/></kerning><kerning kpx1="960"><pair kern="-14" kpx2="940"/><pair kern="-14" kpx2="950"/><pair kern="-14" kpx2="948"/><pair kern="-14" kpx2="974"/><pair kern="-14" kpx2="963"/><pair kern="-14" kpx2="966"/><pair kern="-14" kpx2="969"/><pair kern="-14" kpx2="959"/><pair kern="-14" kpx2="945"/><pair kern="-14" kpx2="962"/></kerning><kerning kpx1="927"><pair kern="-11" kpx2="923"/><pair kern="-54" kpx2="933"/><pair kern="-11" kpx2="916"/><pair kern="-54" kpx2="939"/><pair kern="-11" kpx2="902"/><pair kern="-11" kpx2="913"/></kerning><kerning kpx1="86"><pair kern="-37" kpx2="111"/><pair kern="-18" kpx2="58"/><pair kern="-18" kpx2="114"/><pair kern="-74" kpx2="44"/><pair kern="-18" kpx2="105"/><pair kern="-37" kpx2="173"/><pair kern="-55" kpx2="65"/><pair kern="-37" kpx2="97"/><pair kern="-18" kpx2="894"/><pair kern="-18" kpx2="117"/><pair kern="-18" kpx2="121"/><pair kern="-74" kpx2="46"/><pair kern="-37" kpx2="101"/></kerning><kerning kpx1="958"><pair kern="-14" kpx2="972"/><pair kern="-14" kpx2="940"/><pair kern="-14" kpx2="950"/><pair kern="-14" kpx2="948"/><pair kern="-14" kpx2="963"/><pair kern="-14" kpx2="966"/><pair kern="-14" kpx2="959"/><pair kern="-14" kpx2="945"/><pair kern="-14" kpx2="962"/><pair kern="-14" kpx2="958"/></kerning><kerning kpx1="118"><pair kern="-74" kpx2="46"/><pair kern="-74" kpx2="44"/></kerning><kerning kpx1="1086"><pair kern="-21" kpx2="1103"/><pair kern="-21" kpx2="1093"/><pair kern="-11" kpx2="1101"/><pair kern="-11" kpx2="1079"/><pair kern="-33" kpx2="1091"/><pair kern="-44" kpx2="1095"/><pair kern="-21" kpx2="1078"/><pair kern="-21" kpx2="1083"/></kerning><kerning kpx1="1050"><pair kern="-11" kpx2="1069"/><pair kern="-11" kpx2="1054"/><pair kern="-22" kpx2="1060"/><pair kern="-11" kpx2="1101"/><pair kern="-11" kpx2="1091"/><pair kern="-11" kpx2="1057"/></kerning><kerning kpx1="1060"><pair kern="-21" kpx2="1071"/><pair kern="11" kpx2="1060"/><pair kern="-11" kpx2="1052"/><pair kern="-56" kpx2="1051"/><pair kern="-56" kpx2="1040"/><pair kern="-88" kpx2="1059"/><pair kern="-66" kpx2="1044"/><pair kern="-34" kpx2="1063"/><pair kern="-78" kpx2="1058"/><pair kern="-21" kpx2="1083"/></kerning><kerning kpx1="160"><pair kern="-18" kpx2="923"/><pair kern="-18" kpx2="933"/><pair kern="-37" kpx2="916"/><pair kern="-37" kpx2="65"/><pair kern="-18" kpx2="910"/><pair kern="-18" kpx2="89"/><pair kern="-18" kpx2="939"/><pair kern="-37" kpx2="902"/><pair kern="-37" kpx2="913"/></kerning><kerning kpx1="1047"><pair kern="-21" kpx2="1071"/><pair kern="-21" kpx2="1054"/><pair kern="-21" kpx2="1060"/><pair kern="-21" kpx2="1057"/><pair kern="-33" kpx2="1051"/><pair kern="-44" kpx2="1059"/><pair kern="-33" kpx2="1044"/><pair kern="-33" kpx2="1046"/><pair kern="-34" kpx2="1063"/><pair kern="-44" kpx2="1058"/><pair kern="-11" kpx2="1083"/></kerning><kerning kpx1="1057"><pair kern="-11" kpx2="1052"/><pair kern="-33" kpx2="1044"/><pair kern="-66" kpx2="1066"/><pair kern="-21" kpx2="1061"/><pair kern="-33" kpx2="1058"/><pair kern="-11" kpx2="1054"/><pair kern="-11" kpx2="1091"/><pair kern="-11" kpx2="1047"/><pair kern="11" kpx2="1072"/><pair kern="-33" kpx2="1040"/><pair kern="-33" kpx2="1051"/><pair kern="-56" kpx2="1059"/><pair kern="-21" kpx2="1095"/><pair kern="-43" kpx2="1063"/></kerning><kerning kpx1="937"><pair kern="-54" kpx2="933"/><pair kern="-54" kpx2="939"/></kerning><kerning kpx1="913"><pair kern="-18" kpx2="967"/><pair kern="-128" kpx2="933"/><pair kern="-18" kpx2="957"/><pair kern="-37" kpx2="160"/><pair kern="-51" kpx2="920"/><pair kern="-128" kpx2="939"/><pair kern="-51" kpx2="927"/><pair kern="-58" kpx2="934"/><pair kern="-97" kpx2="932"/><pair kern="-18" kpx2="947"/><pair kern="-37" kpx2="8217"/></kerning><kerning kpx1="82"><pair kern="-18" kpx2="87"/><pair kern="-37" kpx2="89"/><pair kern="-18" kpx2="84"/><pair kern="-18" kpx2="86"/></kerning><kerning kpx1="119"><pair kern="-55" kpx2="46"/><pair kern="-55" kpx2="44"/></kerning><kerning kpx1="1045"><pair kern="-11" kpx2="1047"/></kerning><kerning kpx1="1101"><pair kern="-11" kpx2="1103"/><pair kern="-22" kpx2="1093"/><pair kern="-11" kpx2="1078"/><pair kern="-21" kpx2="1083"/></kerning><kerning kpx1="1084"><pair kern="-11" kpx2="1089"/><pair kern="-11" kpx2="1101"/><pair kern="-11" kpx2="1079"/><pair kern="-11" kpx2="1091"/><pair kern="-11" kpx2="1092"/></kerning><kerning kpx1="1052"><pair kern="11" kpx2="1101"/><pair kern="11" kpx2="1091"/><pair kern="11" kpx2="1072"/><pair kern="-21" kpx2="1095"/><pair kern="-21" kpx2="1063"/></kerning><kerning kpx1="939"><pair kern="-55" kpx2="972"/><pair kern="-74" kpx2="923"/><pair kern="-55" kpx2="940"/><pair kern="-55" kpx2="963"/><pair kern="-18" kpx2="951"/><pair kern="-18" kpx2="954"/><pair kern="-55" kpx2="959"/><pair kern="104" kpx2="912"/><pair kern="-18" kpx2="953"/><pair kern="51" kpx2="970"/><pair kern="-55" kpx2="948"/><pair kern="-74" kpx2="916"/><pair kern="-18" kpx2="942"/><pair kern="-18" kpx2="956"/><pair kern="-55" kpx2="966"/><pair kern="-55" kpx2="945"/><pair kern="-74" kpx2="913"/></kerning><kerning kpx1="959"><pair kern="-14" kpx2="960"/><pair kern="-28" kpx2="967"/><pair kern="-14" kpx2="964"/><pair kern="-18" kpx2="947"/></kerning><kerning kpx1="915"><pair kern="-95" kpx2="923"/><pair kern="-46" kpx2="953"/><pair kern="45" kpx2="970"/><pair kern="-95" kpx2="916"/><pair kern="-127" kpx2="46"/><pair kern="102" kpx2="912"/><pair kern="-95" kpx2="913"/><pair kern="-127" kpx2="44"/></kerning><kerning kpx1="1058"><pair kern="-11" kpx2="1069"/><pair kern="-33" kpx2="1088"/><pair kern="-33" kpx2="1097"/><pair kern="-33" kpx2="1077"/><pair kern="-33" kpx2="1080"/><pair kern="-33" kpx2="1086"/><pair kern="-33" kpx2="1099"/><pair kern="-33" kpx2="1060"/><pair kern="-33" kpx2="1089"/><pair kern="-33" kpx2="1091"/><pair kern="-11" kpx2="1047"/><pair kern="-33" kpx2="1040"/><pair kern="-33" kpx2="1087"/><pair kern="-33" kpx2="1093"/><pair kern="-11" kpx2="58"/><pair kern="-33" kpx2="1084"/><pair kern="11" kpx2="1052"/><pair kern="-33" kpx2="1102"/><pair kern="-21" kpx2="1044"/><pair kern="-88" kpx2="44"/><pair kern="-33" kpx2="1103"/><pair kern="-21" kpx2="1054"/><pair kern="11" kpx2="1071"/><pair kern="-33" kpx2="1082"/><pair kern="-11" kpx2="894"/><pair kern="-33" kpx2="1074"/><pair kern="-21" kpx2="1072"/><pair kern="-33" kpx2="1051"/><pair kern="-33" kpx2="1100"/><pair kern="-88" kpx2="46"/><pair kern="11" kpx2="1046"/><pair kern="-33" kpx2="1083"/></kerning><kerning kpx1="920"><pair kern="-11" kpx2="923"/><pair kern="-54" kpx2="933"/><pair kern="-11" kpx2="916"/><pair kern="-54" kpx2="939"/><pair kern="-11" kpx2="913"/></kerning><kerning kpx1="121"><pair kern="-74" kpx2="46"/><pair kern="-74" kpx2="44"/></kerning><kerning kpx1="1051"><pair kern="11" kpx2="1060"/><pair kern="11" kpx2="1073"/></kerning><kerning kpx1="949"><pair kern="-26" kpx2="962"/></kerning><kerning kpx1="1046"><pair kern="-21" kpx2="1054"/><pair kern="-11" kpx2="1091"/><pair kern="-21" kpx2="1057"/><pair kern="-11" kpx2="1047"/><pair kern="11" kpx2="1066"/><pair kern="-21" kpx2="1063"/></kerning><kerning kpx1="1041"><pair kern="-11" kpx2="1069"/><pair kern="11" kpx2="1076"/><pair kern="-21" kpx2="1044"/><pair kern="-66" kpx2="1066"/><pair kern="-33" kpx2="1061"/><pair kern="-66" kpx2="1058"/><pair kern="11" kpx2="1103"/><pair kern="-33" kpx2="1071"/><pair kern="-21" kpx2="1054"/><pair kern="-22" kpx2="1060"/><pair kern="-21" kpx2="1091"/><pair kern="-21" kpx2="1047"/><pair kern="-21" kpx2="1057"/><pair kern="-33" kpx2="1040"/><pair kern="-33" kpx2="1051"/><pair kern="-56" kpx2="1059"/><pair kern="-21" kpx2="1046"/><pair kern="-56" kpx2="1063"/></kerning><kerning kpx1="1083"><pair kern="-11" kpx2="1091"/><pair kern="-33" kpx2="1095"/></kerning><kerning kpx1="1097"><pair kern="21" kpx2="1091"/><pair kern="11" kpx2="1072"/></kerning><kerning kpx1="950"><pair kern="-49" kpx2="972"/><pair kern="-49" kpx2="940"/><pair kern="-57" kpx2="960"/><pair kern="-49" kpx2="963"/><pair kern="-56" kpx2="951"/><pair kern="-94" kpx2="959"/><pair kern="-57" kpx2="964"/><pair kern="-28" kpx2="947"/><pair kern="-61" kpx2="965"/><pair kern="-56" kpx2="953"/><pair kern="55" kpx2="970"/><pair kern="-28" kpx2="948"/><pair kern="-49" kpx2="974"/><pair kern="-28" kpx2="957"/><pair kern="-28" kpx2="952"/><pair kern="-56" kpx2="942"/><pair kern="-49" kpx2="966"/><pair kern="-49" kpx2="969"/><pair kern="-61" kpx2="949"/><pair kern="-61" kpx2="973"/><pair kern="-49" kpx2="945"/><pair kern="-61" kpx2="941"/></kerning><kerning kpx1="929"><pair kern="-74" kpx2="923"/><pair kern="-74" kpx2="916"/><pair kern="-127" kpx2="46"/><pair kern="-74" kpx2="913"/><pair kern="-127" kpx2="44"/></kerning><kerning kpx1="87"><pair kern="-8" kpx2="105"/><pair kern="-18" kpx2="173"/><pair kern="-18" kpx2="97"/><pair kern="-18" kpx2="65"/><pair kern="-37" kpx2="46"/><pair kern="-18" kpx2="101"/><pair kern="-37" kpx2="44"/></kerning><kerning kpx1="932"><pair kern="-90" kpx2="972"/><pair kern="-90" kpx2="940"/><pair kern="-90" kpx2="963"/><pair kern="-74" kpx2="971"/><pair kern="-18" kpx2="927"/><pair kern="-42" kpx2="947"/><pair kern="-7" kpx2="953"/><pair kern="-74" kpx2="916"/><pair kern="-90" kpx2="966"/><pair kern="-18" kpx2="937"/><pair kern="-90" kpx2="945"/><pair kern="-74" kpx2="913"/><pair kern="-74" kpx2="923"/><pair kern="-42" kpx2="967"/><pair kern="-74" kpx2="58"/><pair kern="-74" kpx2="951"/><pair kern="-83" kpx2="968"/><pair kern="-74" kpx2="944"/><pair kern="-90" kpx2="959"/><pair kern="104" kpx2="912"/><pair kern="-90" kpx2="44"/><pair kern="-74" kpx2="965"/><pair kern="-90" kpx2="173"/><pair kern="45" kpx2="970"/><pair kern="-33" kpx2="948"/><pair kern="-42" kpx2="957"/><pair kern="-74" kpx2="894"/><pair kern="-18" kpx2="920"/><pair kern="-74" kpx2="956"/><pair kern="-90" kpx2="46"/><pair kern="-90" kpx2="949"/><pair kern="-18" kpx2="934"/><pair kern="-74" kpx2="973"/><pair kern="-90" kpx2="941"/></kerning><kerning kpx1="964"><pair kern="-14" kpx2="940"/><pair kern="-14" kpx2="950"/><pair kern="-14" kpx2="948"/><pair kern="-14" kpx2="974"/><pair kern="-14" kpx2="963"/><pair kern="-14" kpx2="966"/><pair kern="-14" kpx2="969"/><pair kern="-14" kpx2="959"/><pair kern="-14" kpx2="945"/><pair kern="-14" kpx2="962"/></kerning><kerning kpx1="1061"><pair kern="-21" kpx2="1086"/><pair kern="-34" kpx2="1054"/><pair kern="-33" kpx2="1060"/><pair kern="-21" kpx2="1091"/><pair kern="-34" kpx2="1057"/><pair kern="-11" kpx2="1047"/></kerning><kerning kpx1="65"><pair kern="-18" kpx2="119"/><pair kern="-18" kpx2="87"/><pair kern="-37" kpx2="160"/><pair kern="-74" kpx2="89"/><pair kern="-8" kpx2="121"/><pair kern="-74" kpx2="84"/><pair kern="-55" kpx2="86"/><pair kern="-37" kpx2="8217"/><pair kern="-18" kpx2="118"/></kerning><kerning kpx1="974"><pair kern="-21" kpx2="960"/><pair kern="-28" kpx2="967"/><pair kern="-21" kpx2="964"/><pair kern="-18" kpx2="947"/></kerning><kerning kpx1="1027"><pair kern="-56" kpx2="171"/><pair kern="-100" kpx2="46"/><pair kern="-56" kpx2="187"/><pair kern="-100" kpx2="44"/></kerning><kerning kpx1="1079"><pair kern="-11" kpx2="1077"/><pair kern="-11" kpx2="1084"/><pair kern="-33" kpx2="1098"/><pair kern="-11" kpx2="1076"/><pair kern="-11" kpx2="1092"/><pair kern="-11" kpx2="1086"/><pair kern="-21" kpx2="1089"/><pair kern="-33" kpx2="1091"/><pair kern="-11" kpx2="1072"/><pair kern="-56" kpx2="1095"/><pair kern="-11" kpx2="1078"/><pair kern="-11" kpx2="1073"/><pair kern="-21" kpx2="1083"/></kerning><kerning kpx1="1091"><pair kern="11" kpx2="1101"/><pair kern="-66" kpx2="46"/><pair kern="11" kpx2="1078"/><pair kern="21" kpx2="1073"/><pair kern="-11" kpx2="1083"/><pair kern="-66" kpx2="44"/></kerning><kerning kpx1="1040"><pair kern="-44" kpx2="1069"/><pair kern="-11" kpx2="1077"/><pair kern="11" kpx2="1044"/><pair kern="-11" kpx2="1092"/><pair kern="-100" kpx2="1058"/><pair kern="-78" kpx2="8217"/><pair kern="-11" kpx2="1086"/><pair kern="-56" kpx2="1054"/><pair kern="-44" kpx2="1060"/><pair kern="-11" kpx2="1089"/><pair kern="-11" kpx2="1091"/><pair kern="-43" kpx2="1047"/><pair kern="-56" kpx2="1057"/><pair kern="-22" kpx2="1055"/><pair kern="-88" kpx2="1059"/><pair kern="-88" kpx2="1063"/><pair kern="-11" kpx2="1073"/></kerning><kerning kpx1="969"><pair kern="-21" kpx2="960"/><pair kern="-28" kpx2="967"/><pair kern="-21" kpx2="964"/><pair kern="-18" kpx2="947"/></kerning><kerning kpx1="1059"><pair kern="11" kpx2="1069"/><pair kern="-11" kpx2="1088"/><pair kern="-11" kpx2="1097"/><pair kern="-21" kpx2="1077"/><pair kern="-11" kpx2="1085"/><pair kern="-11" kpx2="1080"/><pair kern="-21" kpx2="1086"/><pair kern="-11" kpx2="1060"/><pair kern="-11" kpx2="1096"/><pair kern="-21" kpx2="1089"/><pair kern="-11" kpx2="1079"/><pair kern="11" kpx2="1047"/><pair kern="-33" kpx2="1040"/><pair kern="-11" kpx2="1087"/><pair kern="-11" kpx2="1078"/><pair kern="-11" kpx2="1093"/><pair kern="-21" kpx2="58"/><pair kern="-11" kpx2="1084"/><pair kern="-11" kpx2="1094"/><pair kern="-11" kpx2="1076"/><pair kern="-11" kpx2="1102"/><pair kern="-33" kpx2="1044"/><pair kern="-78" kpx2="44"/><pair kern="-11" kpx2="1103"/><pair kern="11" kpx2="1071"/><pair kern="-21" kpx2="1075"/><pair kern="-11" kpx2="1082"/><pair kern="-21" kpx2="894"/><pair kern="-21" kpx2="1074"/><pair kern="-21" kpx2="1051"/><pair kern="-78" kpx2="46"/><pair kern="-34" kpx2="1083"/></kerning><kerning kpx1="923"><pair kern="-128" kpx2="933"/><pair kern="-18" kpx2="160"/><pair kern="-51" kpx2="920"/><pair kern="-128" kpx2="939"/><pair kern="-51" kpx2="927"/><pair kern="-97" kpx2="932"/></kerning><kerning kpx1="967"><pair kern="-17" kpx2="972"/><pair kern="-17" kpx2="940"/><pair kern="-17" kpx2="950"/><pair kern="-17" kpx2="948"/><pair kern="-17" kpx2="974"/><pair kern="-17" kpx2="963"/><pair kern="-17" kpx2="966"/><pair kern="-17" kpx2="969"/><pair kern="-17" kpx2="959"/><pair kern="-17" kpx2="945"/><pair kern="-17" kpx2="962"/></kerning><kerning kpx1="114"><pair kern="-18" kpx2="173"/><pair kern="-37" kpx2="46"/><pair kern="37" kpx2="8217"/><pair kern="-55" kpx2="44"/></kerning><kerning kpx1="961"><pair kern="-21" kpx2="960"/><pair kern="-21" kpx2="964"/></kerning><kerning kpx1="1062"><pair kern="21" kpx2="1086"/><pair kern="21" kpx2="1077"/><pair kern="33" kpx2="1072"/></kerning><kerning kpx1="931"><pair kern="-32" kpx2="964"/></kerning><kerning kpx1="954"><pair kern="-12" kpx2="972"/><pair kern="-12" kpx2="940"/><pair kern="-28" kpx2="950"/><pair kern="-12" kpx2="948"/><pair kern="-12" kpx2="974"/><pair kern="-12" kpx2="963"/><pair kern="-12" kpx2="966"/><pair kern="-12" kpx2="969"/><pair kern="-12" kpx2="959"/><pair kern="-12" kpx2="945"/><pair kern="-28" kpx2="962"/><pair kern="-28" kpx2="958"/></kerning><kerning kpx1="922"><pair kern="-12" kpx2="972"/><pair kern="-12" kpx2="940"/><pair kern="-12" kpx2="950"/><pair kern="-12" kpx2="963"/><pair kern="-47" kpx2="927"/><pair kern="-12" kpx2="959"/><pair kern="-12" kpx2="958"/><pair kern="-12" kpx2="948"/><pair kern="-12" kpx2="974"/><pair kern="-12" kpx2="952"/><pair kern="-47" kpx2="920"/><pair kern="-12" kpx2="966"/><pair kern="-12" kpx2="969"/><pair kern="-61" kpx2="934"/><pair kern="-12" kpx2="945"/></kerning><kerning kpx1="76"><pair kern="-37" kpx2="87"/><pair kern="-18" kpx2="160"/><pair kern="-91" kpx2="89"/><pair kern="-18" kpx2="121"/><pair kern="-74" kpx2="84"/><pair kern="-55" kpx2="86"/><pair kern="-55" kpx2="8217"/></kerning><kerning kpx1="936"><pair kern="-20" kpx2="972"/><pair kern="-20" kpx2="940"/><pair kern="-20" kpx2="948"/><pair kern="-20" kpx2="974"/><pair kern="-20" kpx2="963"/><pair kern="-20" kpx2="966"/><pair kern="-20" kpx2="969"/><pair kern="-20" kpx2="959"/><pair kern="-20" kpx2="945"/></kerning><kerning kpx1="1090"><pair kern="-11" kpx2="1088"/><pair kern="-11" kpx2="1101"/><pair kern="-11" kpx2="1084"/><pair kern="-11" kpx2="1076"/><pair kern="-11" kpx2="44"/><pair kern="-11" kpx2="1103"/><pair kern="-11" kpx2="1086"/><pair kern="-11" kpx2="1089"/><pair kern="-11" kpx2="1079"/><pair kern="-21" kpx2="1091"/><pair kern="-11" kpx2="1072"/><pair kern="-11" kpx2="46"/><pair kern="-11" kpx2="1078"/><pair kern="-21" kpx2="1083"/></kerning><kerning kpx1="1082"><pair kern="-11" kpx2="1089"/><pair kern="-21" kpx2="1095"/><pair kern="11" kpx2="1090"/><pair kern="11" kpx2="1073"/></kerning><kerning kpx1="1118"><pair kern="-56" kpx2="46"/><pair kern="-56" kpx2="44"/></kerning><kerning kpx1="1072"><pair kern="-11" kpx2="1101"/><pair kern="-21" kpx2="1079"/><pair kern="-33" kpx2="1091"/><pair kern="-11" kpx2="1087"/><pair kern="-66" kpx2="1095"/><pair kern="-11" kpx2="1083"/></kerning><kerning kpx1="1100"><pair kern="-88" kpx2="1095"/></kerning><kerning kpx1="935"><pair kern="-18" kpx2="974"/><pair kern="-18" kpx2="969"/></kerning><kerning kpx1="1069"><pair kern="11" kpx2="1103"/><pair kern="-21" kpx2="1071"/><pair kern="11" kpx2="1054"/><pair kern="21" kpx2="1060"/><pair kern="11" kpx2="1084"/><pair kern="-44" kpx2="1051"/><pair kern="21" kpx2="1076"/><pair kern="-34" kpx2="1044"/><pair kern="-34" kpx2="1061"/><pair kern="-22" kpx2="1046"/><pair kern="11" kpx2="1078"/></kerning><kerning kpx1="955"><pair kern="-14" kpx2="972"/><pair kern="-14" kpx2="940"/><pair kern="-14" kpx2="950"/><pair kern="-14" kpx2="963"/><pair kern="-32" kpx2="971"/><pair kern="-32" kpx2="944"/><pair kern="-14" kpx2="959"/><pair kern="-14" kpx2="958"/><pair kern="-32" kpx2="965"/><pair kern="-14" kpx2="948"/><pair kern="-14" kpx2="974"/><pair kern="-19" kpx2="966"/><pair kern="-14" kpx2="969"/><pair kern="-32" kpx2="973"/><pair kern="-14" kpx2="945"/><pair kern="-14" kpx2="962"/></kerning><kerning kpx1="1033"><pair kern="-110" kpx2="8217"/></kerning><kerning kpx1="1034"><pair kern="-88" kpx2="8217"/></kerning><kerning kpx1="80"><pair kern="-74" kpx2="65"/><pair kern="-37" kpx2="160"/><pair kern="-128" kpx2="46"/><pair kern="-128" kpx2="44"/></kerning><kerning kpx1="8222"><pair kern="-110" kpx2="1035"/><pair kern="-122" kpx2="1026"/><pair kern="-110" kpx2="1066"/><pair kern="-145" kpx2="1063"/><pair kern="-133" kpx2="1058"/></kerning><kerning kpx1="1089"><pair kern="-21" kpx2="1093"/><pair kern="-11" kpx2="1091"/><pair kern="-21" kpx2="1098"/><pair kern="-33" kpx2="1095"/><pair kern="-11" kpx2="1078"/></kerning><kerning kpx1="910"><pair kern="-55" kpx2="972"/><pair kern="-74" kpx2="923"/><pair kern="-55" kpx2="940"/><pair kern="-55" kpx2="963"/><pair kern="-18" kpx2="951"/><pair kern="-18" kpx2="954"/><pair kern="-55" kpx2="959"/><pair kern="104" kpx2="912"/><pair kern="-18" kpx2="943"/><pair kern="-18" kpx2="953"/><pair kern="51" kpx2="970"/><pair kern="-55" kpx2="948"/><pair kern="-74" kpx2="916"/><pair kern="-18" kpx2="942"/><pair kern="-18" kpx2="956"/><pair kern="-55" kpx2="966"/><pair kern="-55" kpx2="945"/><pair kern="-74" kpx2="913"/></kerning><kerning kpx1="70"><pair kern="-74" kpx2="65"/><pair kern="-18" kpx2="160"/><pair kern="-128" kpx2="46"/><pair kern="-128" kpx2="44"/></kerning><kerning kpx1="966"><pair kern="-21" kpx2="960"/><pair kern="-28" kpx2="967"/><pair kern="-21" kpx2="964"/><pair kern="-18" kpx2="947"/></kerning><kerning kpx1="1094"><pair kern="11" kpx2="1091"/><pair kern="11" kpx2="1072"/></kerning><kerning kpx1="8216"><pair kern="-37" kpx2="8216"/></kerning><kerning kpx1="1070"><pair kern="-11" kpx2="1054"/><pair kern="-11" kpx2="1057"/><pair kern="-56" kpx2="1051"/><pair kern="-43" kpx2="1040"/><pair kern="-56" kpx2="1044"/><pair kern="-33" kpx2="1061"/><pair kern="-33" kpx2="1046"/><pair kern="-44" kpx2="1063"/><pair kern="-66" kpx2="1058"/></kerning><kerning kpx1="1092"><pair kern="11" kpx2="1086"/><pair kern="11" kpx2="1077"/><pair kern="-21" kpx2="1091"/><pair kern="-44" kpx2="1095"/><pair kern="11" kpx2="1073"/><pair kern="-21" kpx2="1083"/></kerning><kerning kpx1="933"><pair kern="-55" kpx2="972"/><pair kern="-55" kpx2="940"/><pair kern="-74" kpx2="923"/><pair kern="-37" kpx2="58"/><pair kern="-55" kpx2="963"/><pair kern="-18" kpx2="951"/><pair kern="-18" kpx2="954"/><pair kern="-55" kpx2="959"/><pair kern="104" kpx2="912"/><pair kern="-18" kpx2="943"/><pair kern="-18" kpx2="947"/><pair kern="-90" kpx2="44"/><pair kern="-18" kpx2="953"/><pair kern="-74" kpx2="173"/><pair kern="51" kpx2="970"/><pair kern="-55" kpx2="948"/><pair kern="-74" kpx2="916"/><pair kern="-37" kpx2="894"/><pair kern="-18" kpx2="942"/><pair kern="-18" kpx2="956"/><pair kern="-55" kpx2="966"/><pair kern="-90" kpx2="46"/><pair kern="-55" kpx2="945"/><pair kern="-74" kpx2="913"/></kerning><kerning kpx1="102"><pair kern="37" kpx2="8217"/></kerning><kerning kpx1="1074"><pair kern="-21" kpx2="1077"/><pair kern="-21" kpx2="1084"/><pair kern="-44" kpx2="1098"/><pair kern="-21" kpx2="1076"/><pair kern="-11" kpx2="1090"/><pair kern="-21" kpx2="1092"/><pair kern="-21" kpx2="1103"/><pair kern="-21" kpx2="1086"/><pair kern="-21" kpx2="1089"/><pair kern="-21" kpx2="1079"/><pair kern="-33" kpx2="1091"/><pair kern="-21" kpx2="1072"/><pair kern="-56" kpx2="1095"/><pair kern="-21" kpx2="1078"/><pair kern="-11" kpx2="1073"/><pair kern="-33" kpx2="1083"/></kerning><kerning kpx1="84"><pair kern="-91" kpx2="111"/><pair kern="-18" kpx2="79"/><pair kern="-74" kpx2="119"/><pair kern="-74" kpx2="58"/><pair kern="-74" kpx2="114"/><pair kern="-91" kpx2="99"/><pair kern="-91" kpx2="44"/><pair kern="-8" kpx2="105"/><pair kern="-91" kpx2="173"/><pair kern="-74" kpx2="65"/><pair kern="-91" kpx2="97"/><pair kern="-74" kpx2="894"/><pair kern="-74" kpx2="117"/><pair kern="-74" kpx2="121"/><pair kern="-91" kpx2="46"/><pair kern="-91" kpx2="115"/><pair kern="-91" kpx2="101"/></kerning><kerning kpx1="934"><pair kern="-54" kpx2="933"/><pair kern="-54" kpx2="939"/><pair kern="-39" kpx2="913"/></kerning><kerning kpx1="1073"><pair kern="-11" kpx2="1103"/><pair kern="-33" kpx2="1093"/><pair kern="-21" kpx2="1091"/><pair kern="-33" kpx2="1098"/><pair kern="11" kpx2="1076"/><pair kern="-33" kpx2="1095"/><pair kern="-11" kpx2="1078"/><pair kern="-21" kpx2="1083"/></kerning><kerning kpx1="1056"><pair kern="-11" kpx2="1077"/><pair kern="-11" kpx2="58"/><pair kern="-11" kpx2="1052"/><pair kern="-11" kpx2="1076"/><pair kern="-78" kpx2="1044"/><pair kern="-44" kpx2="1061"/><pair kern="-33" kpx2="187"/><pair kern="-56" kpx2="1058"/><pair kern="-155" kpx2="44"/><pair kern="-11" kpx2="1103"/><pair kern="-11" kpx2="1086"/><pair kern="-11" kpx2="1071"/><pair kern="-11" kpx2="1060"/><pair kern="-11" kpx2="894"/><pair kern="-21" kpx2="1047"/><pair kern="-78" kpx2="1040"/><pair kern="-66" kpx2="1051"/><pair kern="-155" kpx2="46"/><pair kern="-44" kpx2="1059"/><pair kern="-43" kpx2="1046"/></kerning><kerning kpx1="1077"><pair kern="-43" kpx2="1093"/><pair kern="-11" kpx2="1089"/><pair kern="-11" kpx2="1079"/><pair kern="-33" kpx2="1091"/><pair kern="-11" kpx2="1084"/><pair kern="-11" kpx2="1072"/><pair kern="-11" kpx2="1076"/><pair kern="-56" kpx2="1095"/><pair kern="-11" kpx2="1078"/><pair kern="-11" kpx2="1092"/><pair kern="-11" kpx2="1090"/><pair kern="-33" kpx2="1083"/></kerning><kerning kpx1="1066"><pair kern="-33" kpx2="1071"/><pair kern="-110" kpx2="8217"/></kerning><kerning kpx1="49"><pair kern="-74" kpx2="49"/></kerning><kerning kpx1="916"><pair kern="-128" kpx2="933"/><pair kern="-37" kpx2="160"/><pair kern="-51" kpx2="920"/><pair kern="-128" kpx2="939"/><pair kern="-51" kpx2="927"/><pair kern="-97" kpx2="932"/></kerning><kerning kpx1="1042"><pair kern="-33" kpx2="1093"/><pair kern="-21" kpx2="1044"/><pair kern="-100" kpx2="1066"/><pair kern="-33" kpx2="1061"/><pair kern="-66" kpx2="1058"/><pair kern="-21" kpx2="1071"/><pair kern="-21" kpx2="1054"/><pair kern="-21" kpx2="1060"/><pair kern="-11" kpx2="1091"/><pair kern="-21" kpx2="1047"/><pair kern="-21" kpx2="1057"/><pair kern="-33" kpx2="1040"/><pair kern="-21" kpx2="1051"/><pair kern="-56" kpx2="1059"/><pair kern="-33" kpx2="1095"/><pair kern="-33" kpx2="1046"/><pair kern="-34" kpx2="1063"/></kerning><kerning kpx1="902"><pair kern="-18" kpx2="967"/><pair kern="-128" kpx2="933"/><pair kern="-18" kpx2="957"/><pair kern="-37" kpx2="160"/><pair kern="-51" kpx2="920"/><pair kern="-128" kpx2="939"/><pair kern="-51" kpx2="927"/><pair kern="-58" kpx2="934"/><pair kern="-97" kpx2="932"/><pair kern="-18" kpx2="947"/></kerning><kerning kpx1="1078"><pair kern="11" kpx2="1091"/><pair kern="11" kpx2="1098"/><pair kern="-21" kpx2="1095"/><pair kern="11" kpx2="1090"/></kerning><kerning kpx1="1068"><pair kern="-33" kpx2="1069"/><pair kern="-21" kpx2="1052"/><pair kern="-21" kpx2="1044"/><pair kern="-56" kpx2="1061"/><pair kern="-110" kpx2="1058"/><pair kern="-122" kpx2="8217"/><pair kern="-44" kpx2="1071"/><pair kern="-44" kpx2="1054"/><pair kern="-33" kpx2="1047"/><pair kern="-44" kpx2="1057"/><pair kern="-43" kpx2="1040"/><pair kern="-21" kpx2="1051"/><pair kern="-56" kpx2="1046"/><pair kern="-100" kpx2="1063"/></kerning><kerning kpx1="1168"><pair kern="-21" kpx2="171"/><pair kern="-56" kpx2="46"/><pair kern="-21" kpx2="187"/><pair kern="-56" kpx2="44"/></kerning><kerning kpx1="1093"><pair kern="-11" kpx2="1086"/><pair kern="-11" kpx2="1089"/><pair kern="-11" kpx2="1077"/><pair kern="-11" kpx2="1101"/><pair kern="-11" kpx2="1079"/><pair kern="-11" kpx2="1072"/><pair kern="-44" kpx2="1095"/><pair kern="-21" kpx2="1092"/></kerning><kerning kpx1="1065"><pair kern="11" kpx2="1077"/><pair kern="11" kpx2="1091"/><pair kern="21" kpx2="1072"/></kerning><kerning kpx1="1076"><pair kern="-11" kpx2="1091"/></kerning><kerning kpx1="1102"><pair kern="-33" kpx2="1093"/><pair kern="-44" kpx2="1095"/><pair kern="-11" kpx2="1078"/><pair kern="-21" kpx2="1083"/></kerning><kerning kpx1="1044"><pair kern="11" kpx2="1069"/><pair kern="21" kpx2="1079"/><pair kern="11" kpx2="1091"/><pair kern="-11" kpx2="1063"/></kerning><kerning kpx1="1043"><pair kern="-43" kpx2="1088"/><pair kern="-43" kpx2="1077"/><pair kern="-56" kpx2="171"/><pair kern="-43" kpx2="1085"/><pair kern="-43" kpx2="1080"/><pair kern="-56" kpx2="187"/><pair kern="-56" kpx2="1086"/><pair kern="-43" kpx2="1099"/><pair kern="-43" kpx2="1091"/><pair kern="-33" kpx2="1057"/><pair kern="-11" kpx2="1047"/><pair kern="-78" kpx2="1040"/><pair kern="-21" kpx2="58"/><pair kern="-43" kpx2="1084"/><pair kern="-44" kpx2="1076"/><pair kern="-44" kpx2="1102"/><pair kern="-43" kpx2="1044"/><pair kern="-100" kpx2="44"/><pair kern="-44" kpx2="1103"/><pair kern="-21" kpx2="1071"/><pair kern="-33" kpx2="1054"/><pair kern="-11" kpx2="894"/><pair kern="-44" kpx2="1074"/><pair kern="-33" kpx2="1072"/><pair kern="-33" kpx2="1051"/><pair kern="-44" kpx2="1100"/><pair kern="-100" kpx2="46"/><pair kern="-43" kpx2="1083"/></kerning><kerning kpx1="8217"><pair kern="-55" kpx2="160"/><pair kern="-18" kpx2="115"/><pair kern="-37" kpx2="8217"/></kerning><kerning kpx1="1054"><pair kern="-21" kpx2="1093"/><pair kern="-21" kpx2="1071"/><pair kern="-33" kpx2="1051"/><pair kern="-21" kpx2="1040"/><pair kern="-66" kpx2="1059"/><pair kern="-34" kpx2="1044"/><pair kern="-33" kpx2="1061"/><pair kern="-33" kpx2="1046"/><pair kern="-33" kpx2="1063"/><pair kern="-11" kpx2="1083"/></kerning><kerning kpx1="911"><pair kern="-54" kpx2="933"/><pair kern="-54" kpx2="939"/></kerning><kerning kpx1="1075"><pair kern="-21" kpx2="1103"/><pair kern="-11" kpx2="1086"/><pair kern="-11" kpx2="1089"/><pair kern="-11" kpx2="1077"/><pair kern="-11" kpx2="1079"/><pair kern="-11" kpx2="1084"/><pair kern="-11" kpx2="1072"/><pair kern="-11" kpx2="1076"/><pair kern="-11" kpx2="1083"/></kerning><kerning kpx1="948"><pair kern="-21" kpx2="960"/><pair kern="-28" kpx2="967"/><pair kern="-21" kpx2="964"/><pair kern="-18" kpx2="947"/></kerning><kerning kpx1="89"><pair kern="-55" kpx2="111"/><pair kern="-37" kpx2="58"/><pair kern="-55" kpx2="112"/><pair kern="-55" kpx2="113"/><pair kern="-37" kpx2="118"/><pair kern="-91" kpx2="44"/><pair kern="-18" kpx2="105"/><pair kern="-74" kpx2="173"/><pair kern="-55" kpx2="65"/><pair kern="-74" kpx2="97"/><pair kern="-18" kpx2="160"/><pair kern="-37" kpx2="894"/><pair kern="-37" kpx2="117"/><pair kern="-91" kpx2="46"/><pair kern="-55" kpx2="101"/></kerning><kerning kpx1="941"><pair kern="-26" kpx2="962"/></kerning></font-metrics>
\ No newline at end of file
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/arialn.ttf b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/arialn.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..7e28e414bb237fc7f295e08b545f749070487299
Binary files /dev/null and b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/arialn.ttf differ
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/arialnb.ttf b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/arialnb.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..11ea16aa87b370a50667b9498c9d1c8aee021679
Binary files /dev/null and b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/arialnb.ttf differ
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/arialnbi.ttf b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/arialnbi.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..ff5002c593fcd30f98ccf75ecd8951d7b925fa79
Binary files /dev/null and b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/arialnbi.ttf differ
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/arialni.ttf b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/arialni.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..a084f3a9eb126eaa51b02757f6decbd833f8b6f2
Binary files /dev/null and b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/arialni.ttf differ
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/arialni.xml b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/arialni.xml
new file mode 100755
index 0000000000000000000000000000000000000000..dd2d9a1eae082c235bbbbd740d41b6fd2550ac49
--- /dev/null
+++ b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/arialni.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><font-metrics metrics-version="2" type="TYPE0"><font-name>ArialNarrow,Italic</font-name><embed/><cap-height>715</cap-height><x-height>518</x-height><ascender>728</ascender><descender>-207</descender><bbox><left>-214</left><bottom>-306</bottom><right>999</right><top>1047</top></bbox><flags>97</flags><stemv>0</stemv><italicangle>-10</italicangle><subtype>TYPE0</subtype><multibyte-extras><cid-type>CIDFontType2</cid-type><default-width>0</default-width><bfranges><bf gi="3" ue="126" us="32"/><bf gi="3" ue="160" us="160"/><bf gi="163" ue="161" us="161"/><bf gi="132" ue="163" us="162"/><bf gi="188" ue="164" us="164"/><bf gi="150" ue="165" us="165"/><bf gi="230" ue="166" us="166"/><bf gi="134" ue="167" us="167"/><bf gi="142" ue="168" us="168"/><bf gi="139" ue="169" us="169"/><bf gi="157" ue="170" us="170"/><bf gi="169" ue="171" us="171"/><bf gi="164" ue="172" us="172"/><bf gi="16" ue="173" us="173"/><bf gi="138" ue="174" us="174"/><bf gi="256" ue="175" us="175"/><bf gi="131" ue="176" us="176"/><bf gi="147" ue="177" us="177"/><bf gi="240" ue="179" us="178"/><bf gi="141" ue="180" us="180"/><bf gi="151" ue="181" us="181"/><bf gi="136" ue="182" us="182"/><bf gi="257" ue="183" us="183"/><bf gi="220" ue="184" us="184"/><bf gi="239" ue="185" us="185"/><bf gi="158" ue="186" us="186"/><bf gi="170" ue="187" us="187"/><bf gi="243" ue="188" us="188"/><bf gi="242" ue="189" us="189"/><bf gi="244" ue="190" us="190"/><bf gi="162" ue="191" us="191"/><bf gi="172" ue="192" us="192"/><bf gi="200" ue="193" us="193"/><bf gi="198" ue="194" us="194"/><bf gi="173" ue="195" us="195"/><bf gi="98" ue="197" us="196"/><bf gi="144" ue="198" us="198"/><bf gi="100" ue="199" us="199"/><bf gi="202" ue="200" us="200"/><bf gi="101" ue="201" us="201"/><bf gi="199" ue="202" us="202"/><bf gi="201" ue="203" us="203"/><bf gi="206" ue="204" us="204"/><bf gi="203" ue="207" us="205"/><bf gi="231" ue="208" us="208"/><bf gi="102" ue="209" us="209"/><bf gi="209" ue="210" us="210"/><bf gi="207" ue="212" us="211"/><bf gi="174" ue="213" us="213"/><bf gi="103" ue="214" us="214"/><bf gi="238" ue="215" us="215"/><bf gi="145" ue="216" us="216"/><bf gi="212" ue="217" us="217"/><bf gi="210" ue="219" us="218"/><bf gi="104" ue="220" us="220"/><bf gi="233" ue="221" us="221"/><bf gi="235" ue="222" us="222"/><bf gi="137" ue="223" us="223"/><bf gi="106" ue="224" us="224"/><bf gi="105" ue="225" us="225"/><bf gi="107" ue="226" us="226"/><bf gi="109" ue="227" us="227"/><bf gi="108" ue="228" us="228"/><bf gi="110" ue="229" us="229"/><bf gi="160" ue="230" us="230"/><bf gi="111" ue="231" us="231"/><bf gi="113" ue="232" us="232"/><bf gi="112" ue="233" us="233"/><bf gi="114" ue="235" us="234"/><bf gi="117" ue="236" us="236"/><bf gi="116" ue="237" us="237"/><bf gi="118" ue="239" us="238"/><bf gi="232" ue="240" us="240"/><bf gi="120" ue="241" us="241"/><bf gi="122" ue="242" us="242"/><bf gi="121" ue="243" us="243"/><bf gi="123" ue="244" us="244"/><bf gi="125" ue="245" us="245"/><bf gi="124" ue="246" us="246"/><bf gi="183" ue="247" us="247"/><bf gi="161" ue="248" us="248"/><bf gi="127" ue="249" us="249"/><bf gi="126" ue="250" us="250"/><bf gi="128" ue="252" us="251"/><bf gi="234" ue="253" us="253"/><bf gi="236" ue="254" us="254"/><bf gi="185" ue="255" us="255"/><bf gi="406" ue="257" us="256"/><bf gi="258" ue="261" us="258"/><bf gi="251" ue="263" us="262"/><bf gi="408" ue="267" us="264"/><bf gi="253" ue="269" us="268"/><bf gi="262" ue="272" us="270"/><bf gi="255" ue="273" us="273"/><bf gi="412" ue="279" us="274"/><bf gi="265" ue="283" us="280"/><bf gi="418" ue="285" us="284"/><bf gi="246" ue="287" us="286"/><bf gi="420" ue="303" us="288"/><bf gi="248" ue="304" us="304"/><bf gi="213" ue="305" us="305"/><bf gi="394" ue="307" us="306"/><bf gi="436" ue="312" us="308"/><bf gi="269" ue="314" us="313"/><bf gi="441" ue="316" us="315"/><bf gi="271" ue="320" us="317"/><bf gi="224" ue="322" us="321"/><bf gi="275" ue="324" us="323"/><bf gi="443" ue="326" us="325"/><bf gi="277" ue="328" us="327"/><bf gi="396" ue="329" us="329"/><bf gi="445" ue="335" us="330"/><bf gi="279" ue="337" us="336"/><bf gi="175" ue="339" us="338"/><bf gi="281" ue="341" us="340"/><bf gi="451" ue="343" us="342"/><bf gi="283" ue="347" us="344"/><bf gi="453" ue="349" us="348"/><bf gi="249" ue="351" us="350"/><bf gi="226" ue="353" us="352"/><bf gi="287" ue="357" us="354"/><bf gi="455" ue="365" us="358"/><bf gi="291" ue="369" us="366"/><bf gi="463" ue="375" us="370"/><bf gi="186" ue="376" us="376"/><bf gi="295" ue="380" us="377"/><bf gi="228" ue="382" us="381"/><bf gi="469" ue="383" us="383"/><bf gi="166" ue="402" us="402"/><bf gi="470" ue="511" us="506"/><bf gi="214" ue="710" us="710"/><bf gi="223" ue="711" us="711"/><bf gi="216" ue="713" us="713"/><bf gi="217" ue="730" us="728"/><bf gi="222" ue="731" us="731"/><bf gi="215" ue="732" us="732"/><bf gi="221" ue="733" us="733"/><bf gi="30" ue="894" us="894"/><bf gi="495" ue="902" us="900"/><bf gi="476" ue="903" us="903"/><bf gi="498" ue="906" us="904"/><bf gi="501" ue="908" us="908"/><bf gi="502" ue="914" us="910"/><bf gi="299" ue="915" us="915"/><bf gi="507" ue="919" us="916"/><bf gi="300" ue="920" us="920"/><bf gi="511" ue="929" us="921"/><bf gi="520" ue="933" us="931"/><bf gi="301" ue="934" us="934"/><bf gi="523" ue="944" us="935"/><bf gi="302" ue="945" us="945"/><bf gi="533" ue="947" us="946"/><bf gi="303" ue="949" us="948"/><bf gi="535" ue="959" us="950"/><bf gi="652" ue="960" us="960"/><bf gi="545" ue="962" us="961"/><bf gi="305" ue="964" us="963"/><bf gi="547" ue="965" us="965"/><bf gi="307" ue="966" us="966"/><bf gi="548" ue="974" us="967"/><bf gi="556" ue="1036" us="1025"/><bf gi="568" ue="1103" us="1038"/><bf gi="634" ue="1116" us="1105"/><bf gi="646" ue="1119" us="1118"/><bf gi="648" ue="1169" us="1168"/><bf gi="477" ue="7813" us="7808"/><bf gi="483" ue="7923" us="7922"/><bf gi="177" ue="8212" us="8211"/><bf gi="650" ue="8213" us="8213"/><bf gi="308" ue="8215" us="8215"/><bf gi="181" ue="8217" us="8216"/><bf gi="195" ue="8218" us="8218"/><bf gi="485" ue="8219" us="8219"/><bf gi="179" ue="8221" us="8220"/><bf gi="196" ue="8222" us="8222"/><bf gi="130" ue="8224" us="8224"/><bf gi="193" ue="8225" us="8225"/><bf gi="135" ue="8226" us="8226"/><bf gi="171" ue="8230" us="8230"/><bf gi="197" ue="8240" us="8240"/><bf gi="397" ue="8243" us="8242"/><bf gi="189" ue="8250" us="8249"/><bf gi="309" ue="8252" us="8252"/><bf gi="486" ue="8254" us="8254"/><bf gi="187" ue="8260" us="8260"/><bf gi="310" ue="8319" us="8319"/><bf gi="245" ue="8355" us="8355"/><bf gi="487" ue="8356" us="8356"/><bf gi="311" ue="8359" us="8359"/><bf gi="657" ue="8364" us="8364"/><bf gi="399" ue="8453" us="8453"/><bf gi="400" ue="8467" us="8467"/><bf gi="651" ue="8470" us="8470"/><bf gi="140" ue="8482" us="8482"/><bf gi="159" ue="8486" us="8486"/><bf gi="488" ue="8494" us="8494"/><bf gi="489" ue="8542" us="8539"/><bf gi="312" ue="8597" us="8592"/><bf gi="318" ue="8616" us="8616"/><bf gi="152" ue="8706" us="8706"/><bf gi="168" ue="8710" us="8710"/><bf gi="154" ue="8719" us="8719"/><bf gi="153" ue="8721" us="8721"/><bf gi="237" ue="8722" us="8722"/><bf gi="187" ue="8725" us="8725"/><bf gi="194" ue="8729" us="8729"/><bf gi="165" ue="8730" us="8730"/><bf gi="146" ue="8734" us="8734"/><bf gi="319" ue="8735" us="8735"/><bf gi="320" ue="8745" us="8745"/><bf gi="156" ue="8747" us="8747"/><bf gi="167" ue="8776" us="8776"/><bf gi="143" ue="8800" us="8800"/><bf gi="321" ue="8801" us="8801"/><bf gi="148" ue="8805" us="8804"/><bf gi="322" ue="8962" us="8962"/><bf gi="323" ue="8976" us="8976"/><bf gi="324" ue="8993" us="8992"/><bf gi="326" ue="9472" us="9472"/><bf gi="327" ue="9474" us="9474"/><bf gi="328" ue="9484" us="9484"/><bf gi="329" ue="9488" us="9488"/><bf gi="330" ue="9492" us="9492"/><bf gi="331" ue="9496" us="9496"/><bf gi="332" ue="9500" us="9500"/><bf gi="333" ue="9508" us="9508"/><bf gi="334" ue="9516" us="9516"/><bf gi="335" ue="9524" us="9524"/><bf gi="336" ue="9532" us="9532"/><bf gi="337" ue="9580" us="9552"/><bf gi="366" ue="9600" us="9600"/><bf gi="367" ue="9604" us="9604"/><bf gi="368" ue="9608" us="9608"/><bf gi="369" ue="9612" us="9612"/><bf gi="370" ue="9619" us="9616"/><bf gi="374" ue="9632" us="9632"/><bf gi="401" ue="9633" us="9633"/><bf gi="402" ue="9643" us="9642"/><bf gi="375" ue="9644" us="9644"/><bf gi="376" ue="9650" us="9650"/><bf gi="377" ue="9658" us="9658"/><bf gi="378" ue="9660" us="9660"/><bf gi="379" ue="9668" us="9668"/><bf gi="184" ue="9674" us="9674"/><bf gi="380" ue="9675" us="9675"/><bf gi="404" ue="9679" us="9679"/><bf gi="381" ue="9689" us="9688"/><bf gi="405" ue="9702" us="9702"/><bf gi="383" ue="9788" us="9786"/><bf gi="386" ue="9792" us="9792"/><bf gi="387" ue="9794" us="9794"/><bf gi="388" ue="9824" us="9824"/><bf gi="389" ue="9827" us="9827"/><bf gi="390" ue="9830" us="9829"/><bf gi="392" ue="9835" us="9834"/><bf gi="191" ue="61442" us="61441"/><bf gi="653" ue="61443" us="61443"/><bf gi="493" ue="61445" us="61444"/><bf gi="654" ue="61448" us="61446"/><bf gi="155" ue="61456" us="61456"/><bf gi="191" ue="64258" us="64257"/><bf gi="0" ue="65535" us="65535"/></bfranges><cid-widths start-index="0"><wx w="228"/><wx w="0"/><wx w="228"/><wx w="228"/><wx w="228"/><wx w="291"/><wx w="456"/><wx w="456"/><wx w="729"/><wx w="546"/><wx w="157"/><wx w="272"/><wx w="272"/><wx w="318"/><wx w="479"/><wx w="228"/><wx w="272"/><wx w="228"/><wx w="228"/><wx w="456"/><wx w="456"/><wx w="456"/><wx w="456"/><wx w="456"/><wx w="456"/><wx w="456"/><wx w="456"/><wx w="456"/><wx w="456"/><wx w="228"/><wx w="228"/><wx w="479"/><wx w="479"/><wx w="479"/><wx w="456"/><wx w="832"/><wx w="546"/><wx w="546"/><wx w="591"/><wx w="591"/><wx w="546"/><wx w="500"/><wx w="638"/><wx w="591"/><wx w="228"/><wx w="410"/><wx w="546"/><wx w="456"/><wx w="683"/><wx w="591"/><wx w="638"/><wx w="546"/><wx w="638"/><wx w="591"/><wx w="546"/><wx w="500"/><wx w="591"/><wx w="546"/><wx w="773"/><wx w="546"/><wx w="546"/><wx w="500"/><wx w="228"/><wx w="228"/><wx w="228"/><wx w="384"/><wx w="456"/><wx w="272"/><wx w="456"/><wx w="456"/><wx w="410"/><wx w="456"/><wx w="456"/><wx w="228"/><wx w="456"/><wx w="456"/><wx w="182"/><wx w="182"/><wx w="410"/><wx w="182"/><wx w="683"/><wx w="456"/><wx w="456"/><wx w="456"/><wx w="456"/><wx w="272"/><wx w="410"/><wx w="228"/><wx w="456"/><wx w="410"/><wx w="591"/><wx w="410"/><wx w="410"/><wx w="410"/><wx w="273"/><wx w="212"/><wx w="273"/><wx w="479"/><wx w="546"/><wx w="546"/><wx w="591"/><wx w="546"/><wx w="591"/><wx w="638"/><wx w="591"/><wx w="456"/><wx w="456"/><wx w="456"/><wx w="456"/><wx w="456"/><wx w="456"/><wx w="410"/><wx w="456"/><wx w="456"/><wx w="456"/><wx w="456"/><wx w="228"/><wx w="228"/><wx w="228"/><wx w="228"/><wx w="456"/><wx w="456"/><wx w="456"/><wx w="456"/><wx w="456"/><wx w="456"/><wx w="456"/><wx w="456"/><wx w="456"/><wx w="456"/><wx w="456"/><wx w="399"/><wx w="456"/><wx w="456"/><wx w="456"/><wx w="287"/><wx w="439"/><wx w="500"/><wx w="604"/><wx w="604"/><wx w="819"/><wx w="272"/><wx w="272"/><wx w="548"/><wx w="819"/><wx w="638"/><wx w="712"/><wx w="548"/><wx w="548"/><wx w="548"/><wx w="456"/><wx w="576"/><wx w="494"/><wx w="712"/><wx w="823"/><wx w="548"/><wx w="273"/><wx w="303"/><wx w="298"/><wx w="768"/><wx w="729"/><wx w="500"/><wx w="500"/><wx w="272"/><wx w="479"/><wx w="548"/><wx w="456"/><wx w="548"/><wx w="611"/><wx w="456"/><wx w="456"/><wx w="819"/><wx w="546"/><wx w="546"/><wx w="638"/><wx w="819"/><wx w="773"/><wx w="456"/><wx w="819"/><wx w="272"/><wx w="272"/><wx w="182"/><wx w="182"/><wx w="548"/><wx w="494"/><wx w="410"/><wx w="546"/><wx w="137"/><wx w="456"/><wx w="272"/><wx w="272"/><wx w="410"/><wx w="410"/><wx w="456"/><wx w="228"/><wx w="182"/><wx w="272"/><wx w="819"/><wx w="546"/><wx w="546"/><wx w="546"/><wx w="546"/><wx w="546"/><wx w="228"/><wx w="228"/><wx w="228"/><wx w="228"/><wx w="638"/><wx w="638"/><wx w="638"/><wx w="591"/><wx w="591"/><wx w="591"/><wx w="228"/><wx w="272"/><wx w="272"/><wx w="272"/><wx w="272"/><wx w="272"/><wx w="272"/><wx w="272"/><wx w="272"/><wx w="272"/><wx w="272"/><wx w="456"/><wx w="182"/><wx w="546"/><wx w="410"/><wx w="500"/><wx w="410"/><wx w="212"/><wx w="591"/><wx w="456"/><wx w="546"/><wx w="410"/><wx w="546"/><wx w="456"/><wx w="479"/><wx w="479"/><wx w="272"/><wx w="272"/><wx w="272"/><wx w="684"/><wx w="684"/><wx w="684"/><wx w="503"/><wx w="638"/><wx w="456"/><wx w="228"/><wx w="546"/><wx w="410"/><wx w="591"/><wx w="410"/><wx w="591"/><wx w="410"/><wx w="453"/><wx w="500"/><wx w="272"/><wx w="546"/><wx w="456"/><wx w="546"/><wx w="456"/><wx w="591"/><wx w="512"/><wx w="591"/><wx w="546"/><wx w="456"/><wx w="546"/><wx w="456"/><wx w="456"/><wx w="182"/><wx w="456"/><wx w="230"/><wx w="456"/><wx w="269"/><wx w="591"/><wx w="456"/><wx w="591"/><wx w="456"/><wx w="638"/><wx w="456"/><wx w="591"/><wx w="272"/><wx w="591"/><wx w="272"/><wx w="546"/><wx w="410"/><wx w="500"/><wx w="228"/><wx w="500"/><wx w="290"/><wx w="591"/><wx w="456"/><wx w="591"/><wx w="456"/><wx w="500"/><wx w="410"/><wx w="500"/><wx w="410"/><wx w="467"/><wx w="638"/><wx w="687"/><wx w="465"/><wx w="457"/><wx w="359"/><wx w="495"/><wx w="307"/><wx w="535"/><wx w="500"/><wx w="456"/><wx w="298"/><wx w="908"/><wx w="1000"/><wx w="500"/><wx w="1000"/><wx w="500"/><wx w="1000"/><wx w="500"/><wx w="500"/><wx w="979"/><wx w="722"/><wx w="478"/><wx w="600"/><wx w="479"/><wx w="604"/><wx w="604"/><wx w="708"/><wx w="615"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="708"/><wx w="729"/><wx w="604"/><wx w="1000"/><wx w="989"/><wx w="989"/><wx w="989"/><wx w="989"/><wx w="604"/><wx w="604"/><wx w="604"/><wx w="1020"/><wx w="1052"/><wx w="916"/><wx w="750"/><wx w="750"/><wx w="531"/><wx w="656"/><wx w="593"/><wx w="510"/><wx w="500"/><wx w="750"/><wx w="638"/><wx w="364"/><wx w="573"/><wx w="157"/><wx w="291"/><wx w="771"/><wx w="397"/><wx w="604"/><wx w="354"/><wx w="354"/><wx w="604"/><wx w="354"/><wx w="546"/><wx w="456"/><wx w="591"/><wx w="410"/><wx w="591"/><wx w="410"/><wx w="546"/><wx w="456"/><wx w="546"/><wx w="456"/><wx w="546"/><wx w="456"/><wx w="638"/><wx w="456"/><wx w="638"/><wx w="456"/><wx w="638"/><wx w="456"/><wx w="591"/><wx w="456"/><wx w="591"/><wx w="456"/><wx w="228"/><wx w="228"/><wx w="228"/><wx w="228"/><wx w="228"/><wx w="228"/><wx w="228"/><wx w="182"/><wx w="410"/><wx w="182"/><wx w="546"/><wx w="410"/><wx w="410"/><wx w="456"/><wx w="182"/><wx w="591"/><wx w="456"/><wx w="592"/><wx w="456"/><wx w="638"/><wx w="456"/><wx w="638"/><wx w="456"/><wx w="591"/><wx w="272"/><wx w="546"/><wx w="410"/><wx w="500"/><wx w="228"/><wx w="591"/><wx w="456"/><wx w="591"/><wx w="456"/><wx w="591"/><wx w="456"/><wx w="591"/><wx w="456"/><wx w="773"/><wx w="591"/><wx w="546"/><wx w="410"/><wx w="182"/><wx w="546"/><wx w="456"/><wx w="819"/><wx w="729"/><wx w="638"/><wx w="500"/><wx w="272"/><wx w="773"/><wx w="591"/><wx w="773"/><wx w="591"/><wx w="773"/><wx w="591"/><wx w="546"/><wx w="410"/><wx w="182"/><wx w="456"/><wx w="456"/><wx w="600"/><wx w="684"/><wx w="684"/><wx w="684"/><wx w="684"/><wx w="272"/><wx w="272"/><wx w="272"/><wx w="272"/><wx w="546"/><wx w="646"/><wx w="693"/><wx w="319"/><wx w="650"/><wx w="709"/><wx w="636"/><wx w="228"/><wx w="546"/><wx w="546"/><wx w="549"/><wx w="546"/><wx w="500"/><wx w="591"/><wx w="228"/><wx w="546"/><wx w="546"/><wx w="683"/><wx w="591"/><wx w="532"/><wx w="638"/><wx w="591"/><wx w="546"/><wx w="492"/><wx w="500"/><wx w="546"/><wx w="546"/><wx w="681"/><wx w="624"/><wx w="228"/><wx w="546"/><wx w="465"/><wx w="359"/><wx w="456"/><wx w="228"/><wx w="451"/><wx w="467"/><wx w="410"/><wx w="379"/><wx w="456"/><wx w="444"/><wx w="228"/><wx w="410"/><wx w="403"/><wx w="576"/><wx w="410"/><wx w="366"/><wx w="456"/><wx w="469"/><wx w="398"/><wx w="451"/><wx w="448"/><wx w="597"/><wx w="639"/><wx w="228"/><wx w="451"/><wx w="456"/><wx w="451"/><wx w="639"/><wx w="546"/><wx w="690"/><wx w="467"/><wx w="580"/><wx w="546"/><wx w="228"/><wx w="228"/><wx w="410"/><wx w="874"/><wx w="806"/><wx w="691"/><wx w="482"/><wx w="523"/><wx w="592"/><wx w="546"/><wx w="534"/><wx w="546"/><wx w="467"/><wx w="577"/><wx w="546"/><wx w="751"/><wx w="502"/><wx w="586"/><wx w="586"/><wx w="482"/><wx w="562"/><wx w="683"/><wx w="591"/><wx w="638"/><wx w="591"/><wx w="546"/><wx w="591"/><wx w="500"/><wx w="523"/><wx w="651"/><wx w="546"/><wx w="596"/><wx w="551"/><wx w="754"/><wx w="756"/><wx w="660"/><wx w="762"/><wx w="534"/><wx w="568"/><wx w="838"/><wx w="559"/><wx w="456"/><wx w="460"/><wx w="428"/><wx w="404"/><wx w="453"/><wx w="456"/><wx w="563"/><wx w="380"/><wx w="456"/><wx w="456"/><wx w="387"/><wx w="462"/><wx w="562"/><wx w="451"/><wx w="456"/><wx w="456"/><wx w="456"/><wx w="410"/><wx w="683"/><wx w="410"/><wx w="685"/><wx w="410"/><wx w="469"/><wx w="423"/><wx w="681"/><wx w="698"/><wx w="508"/><wx w="613"/><wx w="431"/><wx w="402"/><wx w="617"/><wx w="437"/><wx w="456"/><wx w="456"/><wx w="310"/><wx w="405"/><wx w="410"/><wx w="182"/><wx w="228"/><wx w="182"/><wx w="746"/><wx w="679"/><wx w="456"/><wx w="387"/><wx w="443"/><wx w="456"/><wx w="403"/><wx w="277"/><wx w="819"/><wx w="888"/><wx w="548"/><wx w="272"/><wx w="272"/><wx w="272"/><wx w="272"/><wx w="456"/></cid-widths></multibyte-extras><kerning kpx1="341"><pair kern="-55" kpx2="46"/><pair kern="37" kpx2="8217"/><pair kern="-55" kpx2="44"/></kerning><kerning kpx1="87"><pair kern="-18" kpx2="111"/><pair kern="-18" kpx2="58"/><pair kern="-18" kpx2="114"/><pair kern="-18" kpx2="281"/><pair kern="-55" kpx2="44"/><pair kern="-18" kpx2="173"/><pair kern="-37" kpx2="65"/><pair kern="-37" kpx2="97"/><pair kern="-18" kpx2="894"/><pair kern="-37" kpx2="260"/><pair kern="-18" kpx2="117"/><pair kern="-8" kpx2="121"/><pair kern="-37" kpx2="261"/><pair kern="-55" kpx2="46"/><pair kern="-18" kpx2="101"/></kerning><kerning kpx1="80"><pair kern="-74" kpx2="65"/><pair kern="-74" kpx2="260"/><pair kern="-18" kpx2="160"/><pair kern="-128" kpx2="46"/><pair kern="-128" kpx2="44"/></kerning><kerning kpx1="86"><pair kern="-55" kpx2="111"/><pair kern="-37" kpx2="58"/><pair kern="-37" kpx2="114"/><pair kern="-55" kpx2="281"/><pair kern="-91" kpx2="44"/><pair kern="-18" kpx2="105"/><pair kern="-55" kpx2="173"/><pair kern="-74" kpx2="65"/><pair kern="-74" kpx2="97"/><pair kern="-74" kpx2="260"/><pair kern="-37" kpx2="894"/><pair kern="-37" kpx2="117"/><pair kern="-37" kpx2="121"/><pair kern="-74" kpx2="261"/><pair kern="-91" kpx2="46"/><pair kern="-55" kpx2="101"/></kerning><kerning kpx1="49"><pair kern="-74" kpx2="49"/></kerning><kerning kpx1="313"><pair kern="-74" kpx2="354"/><pair kern="-74" kpx2="356"/><pair kern="-74" kpx2="87"/><pair kern="-37" kpx2="160"/><pair kern="-74" kpx2="89"/><pair kern="-37" kpx2="121"/><pair kern="-74" kpx2="84"/><pair kern="-74" kpx2="86"/><pair kern="-55" kpx2="8217"/></kerning><kerning kpx1="118"><pair kern="-74" kpx2="46"/><pair kern="-74" kpx2="44"/></kerning><kerning kpx1="65"><pair kern="-74" kpx2="354"/><pair kern="-74" kpx2="356"/><pair kern="-18" kpx2="119"/><pair kern="-37" kpx2="87"/><pair kern="-55" kpx2="160"/><pair kern="-74" kpx2="89"/><pair kern="-18" kpx2="121"/><pair kern="-74" kpx2="84"/><pair kern="-74" kpx2="86"/><pair kern="-74" kpx2="8217"/><pair kern="-18" kpx2="118"/></kerning><kerning kpx1="70"><pair kern="-55" kpx2="65"/><pair kern="-55" kpx2="260"/><pair kern="-110" kpx2="46"/><pair kern="-110" kpx2="44"/></kerning><kerning kpx1="160"><pair kern="-18" kpx2="354"/><pair kern="-18" kpx2="356"/><pair kern="-55" kpx2="65"/><pair kern="-55" kpx2="260"/><pair kern="-18" kpx2="89"/><pair kern="-18" kpx2="84"/></kerning><kerning kpx1="260"><pair kern="-74" kpx2="354"/><pair kern="-74" kpx2="356"/><pair kern="-18" kpx2="119"/><pair kern="-37" kpx2="87"/><pair kern="-55" kpx2="160"/><pair kern="-74" kpx2="89"/><pair kern="-74" kpx2="84"/><pair kern="-74" kpx2="86"/><pair kern="-74" kpx2="8217"/><pair kern="-18" kpx2="118"/></kerning><kerning kpx1="344"><pair kern="-18" kpx2="354"/><pair kern="-18" kpx2="356"/><pair kern="-18" kpx2="87"/><pair kern="-18" kpx2="89"/><pair kern="-18" kpx2="84"/><pair kern="-18" kpx2="86"/></kerning><kerning kpx1="354"><pair kern="-110" kpx2="111"/><pair kern="-18" kpx2="79"/><pair kern="-55" kpx2="119"/><pair kern="-110" kpx2="58"/><pair kern="-37" kpx2="114"/><pair kern="-110" kpx2="99"/><pair kern="-18" kpx2="336"/><pair kern="-110" kpx2="281"/><pair kern="-110" kpx2="44"/><pair kern="-37" kpx2="105"/><pair kern="-55" kpx2="173"/><pair kern="-74" kpx2="65"/><pair kern="-110" kpx2="97"/><pair kern="-74" kpx2="260"/><pair kern="-18" kpx2="160"/><pair kern="-110" kpx2="894"/><pair kern="-37" kpx2="117"/><pair kern="-55" kpx2="121"/><pair kern="-110" kpx2="261"/><pair kern="-110" kpx2="46"/><pair kern="-110" kpx2="115"/><pair kern="-110" kpx2="101"/></kerning><kerning kpx1="82"><pair kern="-18" kpx2="354"/><pair kern="-18" kpx2="356"/><pair kern="-18" kpx2="87"/><pair kern="-18" kpx2="89"/><pair kern="-18" kpx2="84"/><pair kern="-18" kpx2="86"/></kerning><kerning kpx1="119"><pair kern="-55" kpx2="46"/><pair kern="-55" kpx2="44"/></kerning><kerning kpx1="114"><pair kern="-55" kpx2="46"/><pair kern="37" kpx2="8217"/><pair kern="-55" kpx2="44"/></kerning><kerning kpx1="8216"><pair kern="-18" kpx2="8216"/></kerning><kerning kpx1="345"><pair kern="-55" kpx2="46"/><pair kern="37" kpx2="8217"/><pair kern="-55" kpx2="44"/></kerning><kerning kpx1="76"><pair kern="-74" kpx2="354"/><pair kern="-74" kpx2="356"/><pair kern="-74" kpx2="87"/><pair kern="-37" kpx2="160"/><pair kern="-74" kpx2="89"/><pair kern="-37" kpx2="121"/><pair kern="-74" kpx2="84"/><pair kern="-74" kpx2="86"/><pair kern="-55" kpx2="8217"/></kerning><kerning kpx1="8217"><pair kern="-37" kpx2="160"/><pair kern="-18" kpx2="115"/><pair kern="-18" kpx2="8217"/></kerning><kerning kpx1="356"><pair kern="-110" kpx2="111"/><pair kern="-18" kpx2="79"/><pair kern="-55" kpx2="119"/><pair kern="-110" kpx2="58"/><pair kern="-37" kpx2="114"/><pair kern="-110" kpx2="99"/><pair kern="-18" kpx2="336"/><pair kern="-110" kpx2="281"/><pair kern="-110" kpx2="44"/><pair kern="-37" kpx2="105"/><pair kern="-55" kpx2="173"/><pair kern="-74" kpx2="65"/><pair kern="-110" kpx2="97"/><pair kern="-74" kpx2="260"/><pair kern="-18" kpx2="160"/><pair kern="-110" kpx2="894"/><pair kern="-37" kpx2="117"/><pair kern="-55" kpx2="121"/><pair kern="-110" kpx2="261"/><pair kern="-110" kpx2="46"/><pair kern="-110" kpx2="115"/><pair kern="-110" kpx2="101"/></kerning><kerning kpx1="102"><pair kern="-18" kpx2="102"/><pair kern="18" kpx2="8217"/></kerning><kerning kpx1="89"><pair kern="-91" kpx2="111"/><pair kern="-55" kpx2="58"/><pair kern="-74" kpx2="112"/><pair kern="-91" kpx2="113"/><pair kern="-91" kpx2="281"/><pair kern="-55" kpx2="118"/><pair kern="-128" kpx2="44"/><pair kern="-37" kpx2="105"/><pair kern="-91" kpx2="173"/><pair kern="-74" kpx2="65"/><pair kern="-74" kpx2="97"/><pair kern="-74" kpx2="260"/><pair kern="-18" kpx2="160"/><pair kern="-64" kpx2="894"/><pair kern="-55" kpx2="117"/><pair kern="-74" kpx2="261"/><pair kern="-128" kpx2="46"/><pair kern="-91" kpx2="101"/></kerning><kerning kpx1="84"><pair kern="-110" kpx2="111"/><pair kern="-18" kpx2="79"/><pair kern="-55" kpx2="119"/><pair kern="-110" kpx2="58"/><pair kern="-37" kpx2="114"/><pair kern="-110" kpx2="99"/><pair kern="-18" kpx2="336"/><pair kern="-110" kpx2="281"/><pair kern="-110" kpx2="44"/><pair kern="-37" kpx2="105"/><pair kern="-55" kpx2="173"/><pair kern="-74" kpx2="65"/><pair kern="-110" kpx2="97"/><pair kern="-74" kpx2="260"/><pair kern="-18" kpx2="160"/><pair kern="-110" kpx2="894"/><pair kern="-37" kpx2="117"/><pair kern="-55" kpx2="121"/><pair kern="-110" kpx2="261"/><pair kern="-110" kpx2="46"/><pair kern="-110" kpx2="115"/><pair kern="-110" kpx2="101"/></kerning><kerning kpx1="121"><pair kern="-74" kpx2="46"/><pair kern="-74" kpx2="44"/></kerning><kerning kpx1="340"><pair kern="-18" kpx2="354"/><pair kern="-18" kpx2="356"/><pair kern="-18" kpx2="87"/><pair kern="-18" kpx2="89"/><pair kern="-18" kpx2="84"/><pair kern="-18" kpx2="86"/></kerning></font-metrics>
\ No newline at end of file
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/ariblk.ttf b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/ariblk.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..b51c8c2672a8b4ce14f34f0ff917bc04a706ef30
Binary files /dev/null and b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/ariblk.ttf differ
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/bookos.ttf b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/bookos.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..d5ed82f10775ac38c802d12a101154a2c8494fec
Binary files /dev/null and b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/bookos.ttf differ
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/bookosb.ttf b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/bookosb.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..51f362dd986953cee1cc2d730f5465e6b4a55053
Binary files /dev/null and b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/bookosb.ttf differ
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/bookosbi.ttf b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/bookosbi.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..bfbe1eac753524fffe220e2529befaae22f54d46
Binary files /dev/null and b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/bookosbi.ttf differ
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/bookosi.ttf b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/bookosi.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..e085e5ae370208e88218014f0ac0869f6d12b8f6
Binary files /dev/null and b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/bookosi.ttf differ
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/century.ttf b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/century.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..3b84a015a14c0c49382aacb663b8b61325cd9333
Binary files /dev/null and b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/century.ttf differ
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/comic.ttf b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/comic.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..d17e1be6c4e3848b0c172e4558b521ea6b1994b3
Binary files /dev/null and b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/comic.ttf differ
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/comic.xml b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/comic.xml
new file mode 100755
index 0000000000000000000000000000000000000000..7779700cb4370cb78f0b68999944eb9836c62c4e
--- /dev/null
+++ b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/comic.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><font-metrics metrics-version="2" type="TYPE0"><font-name>ComicSansMS</font-name><embed/><cap-height>758</cap-height><x-height>539</x-height><ascender>778</ascender><descender>-283</descender><bbox><left>-92</left><bottom>-312</bottom><right>1186</right><top>1102</top></bbox><flags>33</flags><stemv>0</stemv><italicangle>0</italicangle><subtype>TYPE0</subtype><multibyte-extras><cid-type>CIDFontType2</cid-type><default-width>0</default-width><bfranges><bf gi="3" ue="126" us="32"/><bf gi="172" ue="160" us="160"/><bf gi="163" ue="161" us="161"/><bf gi="132" ue="163" us="162"/><bf gi="571" ue="164" us="164"/><bf gi="150" ue="165" us="165"/><bf gi="231" ue="166" us="166"/><bf gi="134" ue="167" us="167"/><bf gi="142" ue="168" us="168"/><bf gi="139" ue="169" us="169"/><bf gi="157" ue="170" us="170"/><bf gi="169" ue="171" us="171"/><bf gi="164" ue="172" us="172"/><bf gi="261" ue="173" us="173"/><bf gi="138" ue="174" us="174"/><bf gi="262" ue="175" us="175"/><bf gi="131" ue="176" us="176"/><bf gi="147" ue="177" us="177"/><bf gi="239" ue="179" us="178"/><bf gi="141" ue="180" us="180"/><bf gi="151" ue="181" us="181"/><bf gi="136" ue="182" us="182"/><bf gi="195" ue="183" us="183"/><bf gi="221" ue="184" us="184"/><bf gi="238" ue="185" us="185"/><bf gi="158" ue="186" us="186"/><bf gi="170" ue="187" us="187"/><bf gi="242" ue="188" us="188"/><bf gi="241" ue="189" us="189"/><bf gi="243" ue="190" us="190"/><bf gi="162" ue="191" us="191"/><bf gi="173" ue="192" us="192"/><bf gi="201" ue="193" us="193"/><bf gi="199" ue="194" us="194"/><bf gi="174" ue="195" us="195"/><bf gi="98" ue="197" us="196"/><bf gi="144" ue="198" us="198"/><bf gi="100" ue="199" us="199"/><bf gi="203" ue="200" us="200"/><bf gi="101" ue="201" us="201"/><bf gi="200" ue="202" us="202"/><bf gi="202" ue="203" us="203"/><bf gi="207" ue="204" us="204"/><bf gi="204" ue="207" us="205"/><bf gi="232" ue="208" us="208"/><bf gi="102" ue="209" us="209"/><bf gi="210" ue="210" us="210"/><bf gi="208" ue="212" us="211"/><bf gi="175" ue="213" us="213"/><bf gi="103" ue="214" us="214"/><bf gi="245" ue="215" us="215"/><bf gi="145" ue="216" us="216"/><bf gi="213" ue="217" us="217"/><bf gi="211" ue="219" us="218"/><bf gi="104" ue="220" us="220"/><bf gi="234" ue="222" us="221"/><bf gi="137" ue="223" us="223"/><bf gi="106" ue="224" us="224"/><bf gi="105" ue="225" us="225"/><bf gi="107" ue="226" us="226"/><bf gi="109" ue="227" us="227"/><bf gi="108" ue="228" us="228"/><bf gi="110" ue="229" us="229"/><bf gi="160" ue="230" us="230"/><bf gi="111" ue="231" us="231"/><bf gi="113" ue="232" us="232"/><bf gi="112" ue="233" us="233"/><bf gi="114" ue="235" us="234"/><bf gi="117" ue="236" us="236"/><bf gi="116" ue="237" us="237"/><bf gi="118" ue="239" us="238"/><bf gi="233" ue="240" us="240"/><bf gi="120" ue="241" us="241"/><bf gi="122" ue="242" us="242"/><bf gi="121" ue="243" us="243"/><bf gi="123" ue="244" us="244"/><bf gi="125" ue="245" us="245"/><bf gi="124" ue="246" us="246"/><bf gi="184" ue="247" us="247"/><bf gi="161" ue="248" us="248"/><bf gi="127" ue="249" us="249"/><bf gi="126" ue="250" us="250"/><bf gi="128" ue="252" us="251"/><bf gi="244" ue="253" us="253"/><bf gi="236" ue="254" us="254"/><bf gi="186" ue="255" us="255"/><bf gi="326" ue="257" us="256"/><bf gi="264" ue="261" us="258"/><bf gi="253" ue="263" us="262"/><bf gi="328" ue="267" us="264"/><bf gi="255" ue="269" us="268"/><bf gi="268" ue="272" us="270"/><bf gi="257" ue="273" us="273"/><bf gi="332" ue="279" us="274"/><bf gi="271" ue="283" us="280"/><bf gi="338" ue="285" us="284"/><bf gi="248" ue="287" us="286"/><bf gi="340" ue="303" us="288"/><bf gi="250" ue="304" us="304"/><bf gi="214" ue="305" us="305"/><bf gi="318" ue="307" us="306"/><bf gi="356" ue="312" us="308"/><bf gi="275" ue="314" us="313"/><bf gi="361" ue="316" us="315"/><bf gi="277" ue="320" us="317"/><bf gi="225" ue="322" us="321"/><bf gi="281" ue="324" us="323"/><bf gi="363" ue="326" us="325"/><bf gi="283" ue="328" us="327"/><bf gi="320" ue="329" us="329"/><bf gi="365" ue="335" us="330"/><bf gi="285" ue="337" us="336"/><bf gi="176" ue="339" us="338"/><bf gi="287" ue="341" us="340"/><bf gi="371" ue="343" us="342"/><bf gi="289" ue="347" us="344"/><bf gi="373" ue="349" us="348"/><bf gi="251" ue="351" us="350"/><bf gi="227" ue="353" us="352"/><bf gi="293" ue="357" us="354"/><bf gi="375" ue="365" us="358"/><bf gi="297" ue="369" us="366"/><bf gi="383" ue="375" us="370"/><bf gi="187" ue="376" us="376"/><bf gi="301" ue="380" us="377"/><bf gi="229" ue="382" us="381"/><bf gi="392" ue="383" us="383"/><bf gi="166" ue="402" us="402"/><bf gi="393" ue="508" us="506"/><bf gi="572" ue="509" us="509"/><bf gi="396" ue="511" us="510"/><bf gi="215" ue="710" us="710"/><bf gi="224" ue="711" us="711"/><bf gi="217" ue="713" us="713"/><bf gi="218" ue="730" us="728"/><bf gi="223" ue="731" us="731"/><bf gi="216" ue="732" us="732"/><bf gi="222" ue="733" us="733"/><bf gi="30" ue="894" us="894"/><bf gi="325" ue="900" us="900"/><bf gi="414" ue="902" us="901"/><bf gi="398" ue="903" us="903"/><bf gi="416" ue="906" us="904"/><bf gi="419" ue="908" us="908"/><bf gi="420" ue="914" us="910"/><bf gi="305" ue="915" us="915"/><bf gi="168" ue="916" us="916"/><bf gi="425" ue="919" us="917"/><bf gi="306" ue="920" us="920"/><bf gi="428" ue="929" us="921"/><bf gi="437" ue="933" us="931"/><bf gi="307" ue="934" us="934"/><bf gi="440" ue="936" us="935"/><bf gi="159" ue="937" us="937"/><bf gi="442" ue="942" us="938"/><bf gi="573" ue="943" us="943"/><bf gi="447" ue="944" us="944"/><bf gi="308" ue="945" us="945"/><bf gi="448" ue="947" us="946"/><bf gi="309" ue="949" us="948"/><bf gi="450" ue="955" us="950"/><bf gi="258" ue="956" us="956"/><bf gi="456" ue="959" us="957"/><bf gi="155" ue="960" us="960"/><bf gi="459" ue="962" us="961"/><bf gi="311" ue="964" us="963"/><bf gi="461" ue="965" us="965"/><bf gi="313" ue="966" us="966"/><bf gi="462" ue="974" us="967"/><bf gi="470" ue="1036" us="1025"/><bf gi="482" ue="1103" us="1038"/><bf gi="548" ue="1116" us="1105"/><bf gi="560" ue="1119" us="1118"/><bf gi="562" ue="1169" us="1168"/><bf gi="399" ue="7813" us="7808"/><bf gi="405" ue="7923" us="7922"/><bf gi="178" ue="8212" us="8211"/><bf gi="564" ue="8213" us="8213"/><bf gi="314" ue="8215" us="8215"/><bf gi="182" ue="8217" us="8216"/><bf gi="196" ue="8218" us="8218"/><bf gi="183" ue="8219" us="8219"/><bf gi="180" ue="8221" us="8220"/><bf gi="197" ue="8222" us="8222"/><bf gi="130" ue="8224" us="8224"/><bf gi="194" ue="8225" us="8225"/><bf gi="135" ue="8226" us="8226"/><bf gi="171" ue="8230" us="8230"/><bf gi="198" ue="8240" us="8240"/><bf gi="321" ue="8243" us="8242"/><bf gi="190" ue="8250" us="8249"/><bf gi="315" ue="8252" us="8252"/><bf gi="407" ue="8254" us="8254"/><bf gi="188" ue="8260" us="8260"/><bf gi="316" ue="8319" us="8319"/><bf gi="247" ue="8355" us="8355"/><bf gi="408" ue="8356" us="8356"/><bf gi="317" ue="8359" us="8359"/><bf gi="189" ue="8364" us="8364"/><bf gi="323" ue="8453" us="8453"/><bf gi="324" ue="8467" us="8467"/><bf gi="565" ue="8470" us="8470"/><bf gi="140" ue="8482" us="8482"/><bf gi="259" ue="8486" us="8486"/><bf gi="409" ue="8494" us="8494"/><bf gi="410" ue="8542" us="8539"/><bf gi="152" ue="8706" us="8706"/><bf gi="260" ue="8710" us="8710"/><bf gi="154" ue="8719" us="8719"/><bf gi="153" ue="8721" us="8721"/><bf gi="237" ue="8722" us="8722"/><bf gi="188" ue="8725" us="8725"/><bf gi="195" ue="8729" us="8729"/><bf gi="165" ue="8730" us="8730"/><bf gi="146" ue="8734" us="8734"/><bf gi="156" ue="8747" us="8747"/><bf gi="167" ue="8776" us="8776"/><bf gi="143" ue="8800" us="8800"/><bf gi="148" ue="8805" us="8804"/><bf gi="566" ue="9633" us="9633"/><bf gi="567" ue="9643" us="9642"/><bf gi="185" ue="9674" us="9674"/><bf gi="569" ue="9679" us="9679"/><bf gi="570" ue="9702" us="9702"/><bf gi="192" ue="61442" us="61441"/><bf gi="389" ue="61445" us="61443"/><bf gi="192" ue="64258" us="64257"/><bf gi="0" ue="65535" us="65535"/></bfranges><cid-widths start-index="0"><wx w="500"/><wx w="0"/><wx w="476"/><wx w="298"/><wx w="237"/><wx w="424"/><wx w="842"/><wx w="693"/><wx w="820"/><wx w="654"/><wx w="388"/><wx w="366"/><wx w="366"/><wx w="529"/><wx w="480"/><wx w="276"/><wx w="416"/><wx w="249"/><wx w="511"/><wx w="610"/><wx w="450"/><wx w="610"/><wx w="610"/><wx w="610"/><wx w="610"/><wx w="610"/><wx w="610"/><wx w="610"/><wx w="610"/><wx w="298"/><wx w="298"/><wx w="381"/><wx w="510"/><wx w="381"/><wx w="523"/><wx w="931"/><wx w="731"/><wx w="630"/><wx w="602"/><wx w="721"/><wx w="624"/><wx w="606"/><wx w="679"/><wx w="768"/><wx w="546"/><wx w="665"/><wx w="610"/><wx w="550"/><wx w="882"/><wx w="796"/><wx w="798"/><wx w="520"/><wx w="876"/><wx w="628"/><wx w="693"/><wx w="679"/><wx w="736"/><wx w="649"/><wx w="1039"/><wx w="723"/><wx w="635"/><wx w="693"/><wx w="376"/><wx w="549"/><wx w="376"/><wx w="581"/><wx w="626"/><wx w="556"/><wx w="511"/><wx w="593"/><wx w="513"/><wx w="587"/><wx w="547"/><wx w="508"/><wx w="530"/><wx w="577"/><wx w="280"/><wx w="403"/><wx w="540"/><wx w="273"/><wx w="776"/><wx w="523"/><wx w="525"/><wx w="534"/><wx w="520"/><wx w="480"/><wx w="486"/><wx w="471"/><wx w="520"/><wx w="486"/><wx w="684"/><wx w="590"/><wx w="520"/><wx w="538"/><wx w="366"/><wx w="421"/><wx w="366"/><wx w="597"/><wx w="731"/><wx w="731"/><wx w="602"/><wx w="624"/><wx w="796"/><wx w="798"/><wx w="736"/><wx w="511"/><wx w="511"/><wx w="511"/><wx w="511"/><wx w="511"/><wx w="511"/><wx w="513"/><wx w="547"/><wx w="547"/><wx w="547"/><wx w="547"/><wx w="280"/><wx w="280"/><wx w="280"/><wx w="280"/><wx w="523"/><wx w="525"/><wx w="525"/><wx w="525"/><wx w="525"/><wx w="525"/><wx w="520"/><wx w="520"/><wx w="520"/><wx w="520"/><wx w="596"/><wx w="409"/><wx w="623"/><wx w="793"/><wx w="634"/><wx w="387"/><wx w="693"/><wx w="443"/><wx w="795"/><wx w="795"/><wx w="882"/><wx w="556"/><wx w="556"/><wx w="510"/><wx w="1086"/><wx w="798"/><wx w="836"/><wx w="480"/><wx w="381"/><wx w="381"/><wx w="635"/><wx w="520"/><wx w="508"/><wx w="747"/><wx w="908"/><wx w="627"/><wx w="699"/><wx w="526"/><wx w="449"/><wx w="959"/><wx w="911"/><wx w="525"/><wx w="523"/><wx w="237"/><wx w="480"/><wx w="607"/><wx w="426"/><wx w="619"/><wx w="794"/><wx w="577"/><wx w="577"/><wx w="675"/><wx w="298"/><wx w="731"/><wx w="731"/><wx w="798"/><wx w="1193"/><wx w="896"/><wx w="441"/><wx w="882"/><wx w="393"/><wx w="393"/><wx w="180"/><wx w="180"/><wx w="480"/><wx w="722"/><wx w="431"/><wx w="635"/><wx w="811"/><wx w="610"/><wx w="381"/><wx w="381"/><wx w="658"/><wx w="655"/><wx w="596"/><wx w="249"/><wx w="298"/><wx w="411"/><wx w="1241"/><wx w="731"/><wx w="624"/><wx w="731"/><wx w="624"/><wx w="624"/><wx w="546"/><wx w="546"/><wx w="546"/><wx w="546"/><wx w="798"/><wx w="798"/><wx w="798"/><wx w="736"/><wx w="736"/><wx w="736"/><wx w="280"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="556"/><wx w="550"/><wx w="227"/><wx w="693"/><wx w="403"/><wx w="693"/><wx w="538"/><wx w="404"/><wx w="721"/><wx w="508"/><wx w="635"/><wx w="520"/><wx w="534"/><wx w="480"/><wx w="650"/><wx w="650"/><wx w="650"/><wx w="650"/><wx w="650"/><wx w="650"/><wx w="520"/><wx w="480"/><wx w="416"/><wx w="989"/><wx w="679"/><wx w="530"/><wx w="546"/><wx w="693"/><wx w="486"/><wx w="602"/><wx w="513"/><wx w="602"/><wx w="602"/><wx w="602"/><wx w="520"/><wx w="959"/><wx w="794"/><wx w="416"/><wx w="626"/><wx w="249"/><wx w="731"/><wx w="511"/><wx w="731"/><wx w="511"/><wx w="721"/><wx w="829"/><wx w="721"/><wx w="624"/><wx w="547"/><wx w="624"/><wx w="547"/><wx w="550"/><wx w="273"/><wx w="550"/><wx w="464"/><wx w="550"/><wx w="395"/><wx w="796"/><wx w="523"/><wx w="796"/><wx w="523"/><wx w="798"/><wx w="525"/><wx w="628"/><wx w="480"/><wx w="628"/><wx w="480"/><wx w="693"/><wx w="486"/><wx w="679"/><wx w="471"/><wx w="679"/><wx w="639"/><wx w="736"/><wx w="520"/><wx w="736"/><wx w="520"/><wx w="693"/><wx w="538"/><wx w="693"/><wx w="538"/><wx w="616"/><wx w="798"/><wx w="638"/><wx w="532"/><wx w="525"/><wx w="491"/><wx w="525"/><wx w="471"/><wx w="615"/><wx w="626"/><wx w="449"/><wx w="526"/><wx w="1188"/><wx w="1126"/><wx w="530"/><wx w="621"/><wx w="180"/><wx w="331"/><wx w="820"/><wx w="488"/><wx w="556"/><wx w="731"/><wx w="511"/><wx w="602"/><wx w="513"/><wx w="602"/><wx w="513"/><wx w="624"/><wx w="547"/><wx w="624"/><wx w="547"/><wx w="624"/><wx w="547"/><wx w="679"/><wx w="530"/><wx w="679"/><wx w="530"/><wx w="679"/><wx w="530"/><wx w="768"/><wx w="577"/><wx w="768"/><wx w="577"/><wx w="546"/><wx w="280"/><wx w="546"/><wx w="280"/><wx w="546"/><wx w="280"/><wx w="546"/><wx w="280"/><wx w="665"/><wx w="403"/><wx w="610"/><wx w="540"/><wx w="540"/><wx w="550"/><wx w="273"/><wx w="796"/><wx w="523"/><wx w="796"/><wx w="523"/><wx w="798"/><wx w="525"/><wx w="798"/><wx w="525"/><wx w="628"/><wx w="480"/><wx w="693"/><wx w="486"/><wx w="679"/><wx w="471"/><wx w="736"/><wx w="520"/><wx w="736"/><wx w="520"/><wx w="736"/><wx w="520"/><wx w="736"/><wx w="520"/><wx w="1039"/><wx w="684"/><wx w="635"/><wx w="520"/><wx w="388"/><wx w="388"/><wx w="388"/><wx w="508"/><wx w="731"/><wx w="511"/><wx w="1086"/><wx w="798"/><wx w="525"/><wx w="249"/><wx w="1039"/><wx w="684"/><wx w="1039"/><wx w="684"/><wx w="1039"/><wx w="684"/><wx w="635"/><wx w="520"/><wx w="610"/><wx w="793"/><wx w="549"/><wx w="650"/><wx w="650"/><wx w="650"/><wx w="650"/><wx w="556"/><wx w="731"/><wx w="789"/><wx w="982"/><wx w="756"/><wx w="876"/><wx w="850"/><wx w="969"/><wx w="280"/><wx w="731"/><wx w="630"/><wx w="624"/><wx w="693"/><wx w="768"/><wx w="546"/><wx w="610"/><wx w="689"/><wx w="882"/><wx w="796"/><wx w="720"/><wx w="798"/><wx w="908"/><wx w="520"/><wx w="747"/><wx w="679"/><wx w="635"/><wx w="723"/><wx w="673"/><wx w="546"/><wx w="635"/><wx w="532"/><wx w="491"/><wx w="523"/><wx w="520"/><wx w="586"/><wx w="486"/><wx w="513"/><wx w="523"/><wx w="610"/><wx w="280"/><wx w="540"/><wx w="486"/><wx w="486"/><wx w="513"/><wx w="525"/><wx w="525"/><wx w="513"/><wx w="520"/><wx w="590"/><wx w="585"/><wx w="760"/><wx w="280"/><wx w="520"/><wx w="525"/><wx w="520"/><wx w="760"/><wx w="624"/><wx w="850"/><wx w="616"/><wx w="602"/><wx w="693"/><wx w="546"/><wx w="546"/><wx w="665"/><wx w="1000"/><wx w="977"/><wx w="846"/><wx w="633"/><wx w="635"/><wx w="729"/><wx w="731"/><wx w="604"/><wx w="630"/><wx w="616"/><wx w="768"/><wx w="624"/><wx w="859"/><wx w="601"/><wx w="747"/><wx w="747"/><wx w="633"/><wx w="738"/><wx w="882"/><wx w="768"/><wx w="798"/><wx w="908"/><wx w="520"/><wx w="602"/><wx w="679"/><wx w="635"/><wx w="638"/><wx w="723"/><wx w="773"/><wx w="617"/><wx w="906"/><wx w="957"/><wx w="759"/><wx w="1075"/><wx w="604"/><wx w="654"/><wx w="1130"/><wx w="628"/><wx w="511"/><wx w="525"/><wx w="503"/><wx w="470"/><wx w="592"/><wx w="547"/><wx w="682"/><wx w="439"/><wx w="636"/><wx w="636"/><wx w="492"/><wx w="646"/><wx w="734"/><wx w="559"/><wx w="591"/><wx w="646"/><wx w="534"/><wx w="513"/><wx w="471"/><wx w="520"/><wx w="810"/><wx w="590"/><wx w="618"/><wx w="533"/><wx w="771"/><wx w="792"/><wx w="621"/><wx w="790"/><wx w="491"/><wx w="513"/><wx w="902"/><wx w="505"/><wx w="547"/><wx w="560"/><wx w="470"/><wx w="513"/><wx w="486"/><wx w="280"/><wx w="280"/><wx w="403"/><wx w="889"/><wx w="773"/><wx w="577"/><wx w="492"/><wx w="520"/><wx w="618"/><wx w="616"/><wx w="470"/><wx w="882"/><wx w="1157"/><wx w="734"/><wx w="642"/><wx w="642"/><wx w="642"/><wx w="642"/><wx w="611"/><wx w="911"/><wx w="280"/></cid-widths></multibyte-extras></font-metrics>
\ No newline at end of file
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/comicbd.ttf b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/comicbd.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..75be50486c13f64bf240ec7c03f01f4870afc89f
Binary files /dev/null and b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/comicbd.ttf differ
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/cour.ttf b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/cour.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..b063f34e78f6292e6cde0355bbc748133c1dc253
Binary files /dev/null and b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/cour.ttf differ
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/courbd.ttf b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/courbd.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..a85baf00ce9bc8b401b048968e91bd5c903fc376
Binary files /dev/null and b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/courbd.ttf differ
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/courbi.ttf b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/courbi.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..38705a04188df9c6af4b024c8b343b2dfcab62ce
Binary files /dev/null and b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/courbi.ttf differ
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/couri.ttf b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/couri.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..7e8a5f3b9a2ce49561104dc036e5988cbc52c034
Binary files /dev/null and b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/couri.ttf differ
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/fonts.list b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/fonts.list
new file mode 100755
index 0000000000000000000000000000000000000000..5ac6081b85b1668f9d44efa0ad3ef3700a29c7f2
--- /dev/null
+++ b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/fonts.list
@@ -0,0 +1,44 @@
+andale-mono                     andalemo.ttf
+arial                           arial.ttf
+arial-bold                      arialbd.ttf
+arial-italic                    ariali.ttf
+arial-bold-italic               arialbi.ttf
+arial_black                     ariblk.ttf
+arial_narrow                    arialn.ttf
+arial_narrow-bold               arialnb.ttf
+arial_narrow-italic             arialni.ttf
+arial_narrow-bold-italic        arialnbi.ttf
+comic_sans                      comic.ttf
+comic_sans-bold                 comicbd.ttf
+courier                         cour.ttf
+courier-bold                    courbd.ttf
+courier-italic                  couri.ttf
+courier-bold-italic             courbi.ttf
+georgia                         georgia.ttf
+georgia-bold                    georgiab.ttf
+georgia-italic                  georgiai.ttf
+georgia-bold-italic             georgiaz.ttf
+impact                          impact.ttf
+tahoma                          tahoma.ttf
+tahoma-bold                     tahomabd.ttf
+times                           times.ttf
+times-bold                      timesbd.ttf
+times-italic                    timesi.ttf
+times-bold-italic               timesbi.ttf
+trebuchet_ms                    trebuc.ttf
+trebuchet_ms-bold               trebucbd.ttf
+trebuchet_ms-italic             trebucit.ttf
+trebuchet_ms-bold-italic        trebucbi.ttf
+verdana                         verdana.ttf
+verdana-bold                    verdanab.ttf
+verdana-italic                  verdanai.ttf
+verdana-bold-italic             verdanaz.ttf
+wingdng3		         	  wingdng3.ttf
+webdings			        webdings.ttf
+calibri			CALIBRI.TTF
+calibri-bold			CALIBRIB.TTF
+calibri-italic			CALIBRII.TTF
+calibri-bold-italic			CALIBRIZ.TTF
+cambria-bold			CAMBRIAB.TTF
+cambria-italic			CAMBRIAI.TTF
+cambria-bold-italic			CAMBRIAZ.TTF
\ No newline at end of file
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/georgia.ttf b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/georgia.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..c24d59b68d3ff9571c5612293fe1bfd105315509
Binary files /dev/null and b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/georgia.ttf differ
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/georgiab.ttf b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/georgiab.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..2cfce236e6683ad45f51f9884dfb8778992d7cb9
Binary files /dev/null and b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/georgiab.ttf differ
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/georgiai.ttf b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/georgiai.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..27abc9de979bfea87842b53f74b9a45d6bbb0e9f
Binary files /dev/null and b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/georgiai.ttf differ
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/georgiaz.ttf b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/georgiaz.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..f60957ef072cf8e66cf8290e2a83857006c1d6f6
Binary files /dev/null and b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/georgiaz.ttf differ
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/gothic.ttf b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/gothic.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..879704e34a2d16d5ea8fb44bb0ebecdb13c2c430
Binary files /dev/null and b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/gothic.ttf differ
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/gothicb.ttf b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/gothicb.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..085b88bec330e7f069b5e0dd843c9379b6cbfd59
Binary files /dev/null and b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/gothicb.ttf differ
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/gothicbi.ttf b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/gothicbi.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..d846a18159b702de1807d965e3063e272aba48ce
Binary files /dev/null and b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/gothicbi.ttf differ
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/gothici.ttf b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/gothici.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..861477b280e320e7e9ace0a34c38815b36e1fa85
Binary files /dev/null and b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/gothici.ttf differ
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/symbol.ttf b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/symbol.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..8faf8a34098eada62e92f9b91f3b7cf246653e64
Binary files /dev/null and b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/symbol.ttf differ
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/tahoma.ttf b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/tahoma.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..95009c1be572a15820c87ada596749831d1710c2
Binary files /dev/null and b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/tahoma.ttf differ
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/tahoma.xml b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/tahoma.xml
new file mode 100755
index 0000000000000000000000000000000000000000..87d650c57a5959a644be1ef334a8cb16ca7e2ad7
--- /dev/null
+++ b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/tahoma.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><font-metrics metrics-version="2" type="TYPE0"><font-name>Tahoma</font-name><embed/><cap-height>727</cap-height><x-height>545</x-height><ascender>764</ascender><descender>-206</descender><bbox><left>-599</left><bottom>-207</bottom><right>1338</right><top>1034</top></bbox><flags>33</flags><stemv>0</stemv><italicangle>0</italicangle><subtype>TYPE0</subtype><multibyte-extras><cid-type>CIDFontType2</cid-type><default-width>0</default-width><bfranges><bf gi="3" ue="126" us="32"/><bf gi="3" ue="160" us="160"/><bf gi="163" ue="161" us="161"/><bf gi="132" ue="163" us="162"/><bf gi="571" ue="164" us="164"/><bf gi="150" ue="165" us="165"/><bf gi="230" ue="166" us="166"/><bf gi="134" ue="167" us="167"/><bf gi="142" ue="168" us="168"/><bf gi="139" ue="169" us="169"/><bf gi="157" ue="170" us="170"/><bf gi="169" ue="171" us="171"/><bf gi="164" ue="172" us="172"/><bf gi="16" ue="173" us="173"/><bf gi="138" ue="174" us="174"/><bf gi="256" ue="175" us="175"/><bf gi="131" ue="176" us="176"/><bf gi="147" ue="177" us="177"/><bf gi="240" ue="179" us="178"/><bf gi="141" ue="180" us="180"/><bf gi="151" ue="181" us="181"/><bf gi="136" ue="182" us="182"/><bf gi="257" ue="183" us="183"/><bf gi="220" ue="184" us="184"/><bf gi="239" ue="185" us="185"/><bf gi="158" ue="186" us="186"/><bf gi="170" ue="187" us="187"/><bf gi="243" ue="188" us="188"/><bf gi="242" ue="189" us="189"/><bf gi="244" ue="190" us="190"/><bf gi="162" ue="191" us="191"/><bf gi="172" ue="192" us="192"/><bf gi="200" ue="193" us="193"/><bf gi="198" ue="194" us="194"/><bf gi="173" ue="195" us="195"/><bf gi="98" ue="197" us="196"/><bf gi="144" ue="198" us="198"/><bf gi="100" ue="199" us="199"/><bf gi="202" ue="200" us="200"/><bf gi="101" ue="201" us="201"/><bf gi="199" ue="202" us="202"/><bf gi="201" ue="203" us="203"/><bf gi="206" ue="204" us="204"/><bf gi="203" ue="207" us="205"/><bf gi="231" ue="208" us="208"/><bf gi="102" ue="209" us="209"/><bf gi="209" ue="210" us="210"/><bf gi="207" ue="212" us="211"/><bf gi="174" ue="213" us="213"/><bf gi="103" ue="214" us="214"/><bf gi="238" ue="215" us="215"/><bf gi="145" ue="216" us="216"/><bf gi="212" ue="217" us="217"/><bf gi="210" ue="219" us="218"/><bf gi="104" ue="220" us="220"/><bf gi="233" ue="221" us="221"/><bf gi="235" ue="222" us="222"/><bf gi="137" ue="223" us="223"/><bf gi="106" ue="224" us="224"/><bf gi="105" ue="225" us="225"/><bf gi="107" ue="226" us="226"/><bf gi="109" ue="227" us="227"/><bf gi="108" ue="228" us="228"/><bf gi="110" ue="229" us="229"/><bf gi="160" ue="230" us="230"/><bf gi="111" ue="231" us="231"/><bf gi="113" ue="232" us="232"/><bf gi="112" ue="233" us="233"/><bf gi="114" ue="235" us="234"/><bf gi="117" ue="236" us="236"/><bf gi="116" ue="237" us="237"/><bf gi="118" ue="239" us="238"/><bf gi="232" ue="240" us="240"/><bf gi="120" ue="241" us="241"/><bf gi="122" ue="242" us="242"/><bf gi="121" ue="243" us="243"/><bf gi="123" ue="244" us="244"/><bf gi="125" ue="245" us="245"/><bf gi="124" ue="246" us="246"/><bf gi="183" ue="247" us="247"/><bf gi="161" ue="248" us="248"/><bf gi="127" ue="249" us="249"/><bf gi="126" ue="250" us="250"/><bf gi="128" ue="252" us="251"/><bf gi="234" ue="253" us="253"/><bf gi="236" ue="254" us="254"/><bf gi="185" ue="255" us="255"/><bf gi="324" ue="257" us="256"/><bf gi="258" ue="261" us="258"/><bf gi="251" ue="263" us="262"/><bf gi="326" ue="267" us="264"/><bf gi="253" ue="269" us="268"/><bf gi="262" ue="272" us="270"/><bf gi="255" ue="273" us="273"/><bf gi="330" ue="279" us="274"/><bf gi="265" ue="283" us="280"/><bf gi="336" ue="285" us="284"/><bf gi="246" ue="287" us="286"/><bf gi="338" ue="303" us="288"/><bf gi="248" ue="304" us="304"/><bf gi="213" ue="305" us="305"/><bf gi="312" ue="307" us="306"/><bf gi="354" ue="312" us="308"/><bf gi="269" ue="314" us="313"/><bf gi="359" ue="316" us="315"/><bf gi="271" ue="320" us="317"/><bf gi="224" ue="322" us="321"/><bf gi="275" ue="324" us="323"/><bf gi="361" ue="326" us="325"/><bf gi="277" ue="328" us="327"/><bf gi="314" ue="329" us="329"/><bf gi="363" ue="335" us="330"/><bf gi="279" ue="337" us="336"/><bf gi="175" ue="339" us="338"/><bf gi="281" ue="341" us="340"/><bf gi="369" ue="343" us="342"/><bf gi="283" ue="347" us="344"/><bf gi="371" ue="349" us="348"/><bf gi="249" ue="351" us="350"/><bf gi="226" ue="353" us="352"/><bf gi="287" ue="357" us="354"/><bf gi="373" ue="365" us="358"/><bf gi="291" ue="369" us="366"/><bf gi="381" ue="375" us="370"/><bf gi="186" ue="376" us="376"/><bf gi="295" ue="380" us="377"/><bf gi="228" ue="382" us="381"/><bf gi="387" ue="383" us="383"/><bf gi="1217" ue="399" us="399"/><bf gi="166" ue="402" us="402"/><bf gi="582" ue="417" us="416"/><bf gi="584" ue="432" us="431"/><bf gi="388" ue="511" us="506"/><bf gi="1067" ue="539" us="536"/><bf gi="1218" ue="601" us="601"/><bf gi="214" ue="710" us="710"/><bf gi="223" ue="711" us="711"/><bf gi="216" ue="713" us="713"/><bf gi="217" ue="730" us="728"/><bf gi="222" ue="731" us="731"/><bf gi="215" ue="732" us="732"/><bf gi="221" ue="733" us="733"/><bf gi="588" ue="769" us="768"/><bf gi="891" ue="771" us="771"/><bf gi="650" ue="777" us="777"/><bf gi="649" ue="803" us="803"/><bf gi="588" ue="833" us="832"/><bf gi="30" ue="894" us="894"/><bf gi="413" ue="902" us="900"/><bf gi="394" ue="903" us="903"/><bf gi="416" ue="906" us="904"/><bf gi="419" ue="908" us="908"/><bf gi="420" ue="914" us="910"/><bf gi="299" ue="915" us="915"/><bf gi="425" ue="919" us="916"/><bf gi="300" ue="920" us="920"/><bf gi="429" ue="929" us="921"/><bf gi="438" ue="933" us="931"/><bf gi="301" ue="934" us="934"/><bf gi="441" ue="944" us="935"/><bf gi="302" ue="945" us="945"/><bf gi="451" ue="947" us="946"/><bf gi="303" ue="949" us="948"/><bf gi="453" ue="959" us="950"/><bf gi="570" ue="960" us="960"/><bf gi="463" ue="962" us="961"/><bf gi="305" ue="964" us="963"/><bf gi="465" ue="965" us="965"/><bf gi="307" ue="966" us="966"/><bf gi="466" ue="974" us="967"/><bf gi="1072" ue="1024" us="1024"/><bf gi="474" ue="1036" us="1025"/><bf gi="1074" ue="1037" us="1037"/><bf gi="486" ue="1103" us="1038"/><bf gi="1071" ue="1104" us="1104"/><bf gi="552" ue="1116" us="1105"/><bf gi="1073" ue="1117" us="1117"/><bf gi="564" ue="1119" us="1118"/><bf gi="566" ue="1169" us="1168"/><bf gi="1197" ue="1171" us="1170"/><bf gi="1199" ue="1175" us="1174"/><bf gi="1201" ue="1181" us="1178"/><bf gi="1205" ue="1187" us="1186"/><bf gi="1207" ue="1203" us="1198"/><bf gi="1213" ue="1211" us="1208"/><bf gi="1217" ue="1241" us="1240"/><bf gi="1219" ue="1257" us="1256"/><bf gi="653" ue="1465" us="1456"/><bf gi="1075" ue="1466" us="1466"/><bf gi="663" ue="1475" us="1467"/><bf gi="672" ue="1514" us="1488"/><bf gi="699" ue="1524" us="1520"/><bf gi="748" ue="1548" us="1548"/><bf gi="749" ue="1563" us="1563"/><bf gi="750" ue="1567" us="1567"/><bf gi="751" ue="1569" us="1569"/><bf gi="897" ue="1570" us="1570"/><bf gi="899" ue="1571" us="1571"/><bf gi="901" ue="1572" us="1572"/><bf gi="903" ue="1573" us="1573"/><bf gi="905" ue="1574" us="1574"/><bf gi="909" ue="1575" us="1575"/><bf gi="911" ue="1576" us="1576"/><bf gi="915" ue="1577" us="1577"/><bf gi="917" ue="1578" us="1578"/><bf gi="921" ue="1579" us="1579"/><bf gi="925" ue="1580" us="1580"/><bf gi="929" ue="1581" us="1581"/><bf gi="933" ue="1582" us="1582"/><bf gi="937" ue="1583" us="1583"/><bf gi="939" ue="1584" us="1584"/><bf gi="941" ue="1585" us="1585"/><bf gi="943" ue="1586" us="1586"/><bf gi="945" ue="1587" us="1587"/><bf gi="949" ue="1588" us="1588"/><bf gi="953" ue="1589" us="1589"/><bf gi="957" ue="1590" us="1590"/><bf gi="961" ue="1591" us="1591"/><bf gi="965" ue="1592" us="1592"/><bf gi="969" ue="1593" us="1593"/><bf gi="973" ue="1594" us="1594"/><bf gi="752" ue="1600" us="1600"/><bf gi="977" ue="1601" us="1601"/><bf gi="981" ue="1602" us="1602"/><bf gi="985" ue="1603" us="1603"/><bf gi="989" ue="1604" us="1604"/><bf gi="993" ue="1605" us="1605"/><bf gi="997" ue="1606" us="1606"/><bf gi="1001" ue="1607" us="1607"/><bf gi="1005" ue="1608" us="1608"/><bf gi="1007" ue="1609" us="1609"/><bf gi="1009" ue="1610" us="1610"/><bf gi="753" ue="1618" us="1611"/><bf gi="761" ue="1643" us="1632"/><bf gi="748" ue="1644" us="1644"/><bf gi="773" ue="1645" us="1645"/><bf gi="1249" ue="1648" us="1648"/><bf gi="1228" ue="1657" us="1657"/><bf gi="799" ue="1662" us="1662"/><bf gi="807" ue="1670" us="1670"/><bf gi="1232" ue="1672" us="1672"/><bf gi="1234" ue="1681" us="1681"/><bf gi="811" ue="1688" us="1688"/><bf gi="803" ue="1700" us="1700"/><bf gi="813" ue="1705" us="1705"/><bf gi="817" ue="1711" us="1711"/><bf gi="1236" ue="1722" us="1722"/><bf gi="1003" ue="1726" us="1726"/><bf gi="1021" ue="1728" us="1728"/><bf gi="1238" ue="1729" us="1729"/><bf gi="1241" ue="1731" us="1730"/><bf gi="821" ue="1740" us="1740"/><bf gi="1243" ue="1746" us="1746"/><bf gi="1245" ue="1747" us="1747"/><bf gi="1247" ue="1748" us="1748"/><bf gi="776" ue="1749" us="1749"/><bf gi="1250" ue="1750" us="1750"/><bf gi="1251" ue="1753" us="1753"/><bf gi="761" ue="1779" us="1776"/><bf gi="778" ue="1782" us="1780"/><bf gi="768" ue="1785" us="1783"/><bf gi="1076" ue="3642" us="3585"/><bf gi="1134" ue="3675" us="3647"/><bf gi="395" ue="7813" us="7808"/><bf gi="605" ue="7883" us="7840"/><bf gi="844" ue="7921" us="7884"/><bf gi="401" ue="7923" us="7922"/><bf gi="884" ue="7929" us="7924"/><bf gi="744" ue="8207" us="8204"/><bf gi="177" ue="8212" us="8211"/><bf gi="568" ue="8213" us="8213"/><bf gi="308" ue="8215" us="8215"/><bf gi="181" ue="8217" us="8216"/><bf gi="195" ue="8218" us="8218"/><bf gi="403" ue="8219" us="8219"/><bf gi="179" ue="8221" us="8220"/><bf gi="196" ue="8222" us="8222"/><bf gi="130" ue="8224" us="8224"/><bf gi="193" ue="8225" us="8225"/><bf gi="135" ue="8226" us="8226"/><bf gi="171" ue="8230" us="8230"/><bf gi="197" ue="8240" us="8240"/><bf gi="315" ue="8243" us="8242"/><bf gi="189" ue="8250" us="8249"/><bf gi="309" ue="8252" us="8252"/><bf gi="404" ue="8254" us="8254"/><bf gi="187" ue="8260" us="8260"/><bf gi="310" ue="8319" us="8319"/><bf gi="245" ue="8355" us="8355"/><bf gi="405" ue="8356" us="8356"/><bf gi="311" ue="8359" us="8359"/><bf gi="704" ue="8362" us="8362"/><bf gi="890" ue="8363" us="8363"/><bf gi="188" ue="8364" us="8364"/><bf gi="317" ue="8453" us="8453"/><bf gi="318" ue="8467" us="8467"/><bf gi="569" ue="8470" us="8470"/><bf gi="140" ue="8482" us="8482"/><bf gi="159" ue="8486" us="8486"/><bf gi="406" ue="8494" us="8494"/><bf gi="407" ue="8542" us="8539"/><bf gi="152" ue="8706" us="8706"/><bf gi="168" ue="8710" us="8710"/><bf gi="154" ue="8719" us="8719"/><bf gi="153" ue="8721" us="8721"/><bf gi="237" ue="8722" us="8722"/><bf gi="187" ue="8725" us="8725"/><bf gi="194" ue="8729" us="8729"/><bf gi="165" ue="8730" us="8730"/><bf gi="146" ue="8734" us="8734"/><bf gi="156" ue="8747" us="8747"/><bf gi="167" ue="8776" us="8776"/><bf gi="143" ue="8800" us="8800"/><bf gi="148" ue="8805" us="8804"/><bf gi="319" ue="9633" us="9633"/><bf gi="320" ue="9643" us="9642"/><bf gi="184" ue="9674" us="9674"/><bf gi="322" ue="9679" us="9679"/><bf gi="323" ue="9702" us="9702"/><bf gi="1252" ue="9839" us="9839"/><bf gi="705" ue="59397" us="59393"/><bf gi="786" ue="59416" us="59416"/><bf gi="795" ue="59450" us="59450"/><bf gi="191" ue="61442" us="61441"/><bf gi="411" ue="61445" us="61444"/><bf gi="1024" ue="61469" us="61446"/><bf gi="1052" ue="61484" us="61470"/><bf gi="1048" ue="61488" us="61485"/><bf gi="213" ue="61489" us="61489"/><bf gi="1163" ue="63258" us="63232"/><bf gi="1190" ue="63261" us="63260"/><bf gi="191" ue="64258" us="64257"/><bf gi="710" ue="64288" us="64288"/><bf gi="711" ue="64310" us="64298"/><bf gi="724" ue="64316" us="64312"/><bf gi="729" ue="64318" us="64318"/><bf gi="730" ue="64321" us="64320"/><bf gi="732" ue="64324" us="64323"/><bf gi="734" ue="64335" us="64326"/><bf gi="799" ue="64345" us="64342"/><bf gi="1228" ue="64361" us="64358"/><bf gi="803" ue="64362" us="64362"/><bf gi="790" ue="64364" us="64363"/><bf gi="788" ue="64365" us="64365"/><bf gi="807" ue="64381" us="64378"/><bf gi="1232" ue="64393" us="64392"/><bf gi="811" ue="64395" us="64394"/><bf gi="1234" ue="64397" us="64396"/><bf gi="813" ue="64405" us="64398"/><bf gi="1236" ue="64415" us="64414"/><bf gi="1022" ue="64421" us="64420"/><bf gi="1248" ue="64422" us="64422"/><bf gi="1238" ue="64425" us="64423"/><bf gi="1003" ue="64427" us="64426"/><bf gi="1003" ue="64429" us="64428"/><bf gi="1243" ue="64433" us="64430"/><bf gi="821" ue="64509" us="64508"/><bf gi="1192" ue="64510" us="64510"/><bf gi="1012" ue="64511" us="64511"/><bf gi="839" ue="64610" us="64606"/><bf gi="892" ue="64831" us="64830"/><bf gi="895" ue="65010" us="65010"/><bf gi="896" ue="65276" us="65152"/><bf gi="572" ue="65532" us="65532"/><bf gi="0" ue="65535" us="65535"/></bfranges><cid-widths start-index="0"><wx w="1000"/><wx w="0"/><wx w="312"/><wx w="312"/><wx w="332"/><wx w="401"/><wx w="727"/><wx w="545"/><wx w="976"/><wx w="673"/><wx w="210"/><wx w="382"/><wx w="382"/><wx w="545"/><wx w="727"/><wx w="302"/><wx w="363"/><wx w="302"/><wx w="382"/><wx w="545"/><wx w="545"/><wx w="545"/><wx w="545"/><wx w="545"/><wx w="545"/><wx w="545"/><wx w="545"/><wx w="545"/><wx w="545"/><wx w="353"/><wx w="353"/><wx w="727"/><wx w="727"/><wx w="727"/><wx w="473"/><wx w="909"/><wx w="599"/><wx w="589"/><wx w="600"/><wx w="678"/><wx w="561"/><wx w="521"/><wx w="667"/><wx w="675"/><wx w="373"/><wx w="416"/><wx w="587"/><wx w="497"/><wx w="770"/><wx w="667"/><wx w="707"/><wx w="551"/><wx w="707"/><wx w="620"/><wx w="557"/><wx w="583"/><wx w="655"/><wx w="596"/><wx w="901"/><wx w="580"/><wx w="576"/><wx w="559"/><wx w="382"/><wx w="382"/><wx w="382"/><wx w="727"/><wx w="545"/><wx w="545"/><wx w="524"/><wx w="552"/><wx w="461"/><wx w="552"/><wx w="526"/><wx w="318"/><wx w="552"/><wx w="557"/><wx w="228"/><wx w="281"/><wx w="498"/><wx w="228"/><wx w="839"/><wx w="557"/><wx w="542"/><wx w="552"/><wx w="552"/><wx w="360"/><wx w="446"/><wx w="334"/><wx w="557"/><wx w="498"/><wx w="742"/><wx w="495"/><wx w="498"/><wx w="444"/><wx w="480"/><wx w="382"/><wx w="480"/><wx w="727"/><wx w="599"/><wx w="599"/><wx w="600"/><wx w="561"/><wx w="667"/><wx w="707"/><wx w="655"/><wx w="524"/><wx w="524"/><wx w="524"/><wx w="524"/><wx w="524"/><wx w="524"/><wx w="461"/><wx w="526"/><wx w="526"/><wx w="526"/><wx w="526"/><wx w="228"/><wx w="228"/><wx w="228"/><wx w="228"/><wx w="557"/><wx w="542"/><wx w="542"/><wx w="542"/><wx w="542"/><wx w="542"/><wx w="557"/><wx w="557"/><wx w="557"/><wx w="557"/><wx w="545"/><wx w="470"/><wx w="545"/><wx w="545"/><wx w="545"/><wx w="454"/><wx w="545"/><wx w="548"/><wx w="928"/><wx w="928"/><wx w="875"/><wx w="545"/><wx w="545"/><wx w="727"/><wx w="913"/><wx w="707"/><wx w="909"/><wx w="727"/><wx w="727"/><wx w="727"/><wx w="545"/><wx w="567"/><wx w="545"/><wx w="636"/><wx w="680"/><wx w="563"/><wx w="545"/><wx w="493"/><wx w="493"/><wx w="702"/><wx w="879"/><wx w="542"/><wx w="473"/><wx w="332"/><wx w="727"/><wx w="727"/><wx w="545"/><wx w="727"/><wx w="619"/><wx w="573"/><wx w="573"/><wx w="817"/><wx w="599"/><wx w="599"/><wx w="707"/><wx w="976"/><wx w="908"/><wx w="545"/><wx w="909"/><wx w="401"/><wx w="401"/><wx w="210"/><wx w="210"/><wx w="727"/><wx w="727"/><wx w="498"/><wx w="576"/><wx w="432"/><wx w="545"/><wx w="382"/><wx w="382"/><wx w="533"/><wx w="530"/><wx w="545"/><wx w="302"/><wx w="210"/><wx w="397"/><wx w="1390"/><wx w="599"/><wx w="561"/><wx w="599"/><wx w="561"/><wx w="561"/><wx w="373"/><wx w="373"/><wx w="373"/><wx w="373"/><wx w="707"/><wx w="707"/><wx w="707"/><wx w="655"/><wx w="655"/><wx w="655"/><wx w="228"/><wx w="545"/><wx w="545"/><wx w="545"/><wx w="545"/><wx w="545"/><wx w="545"/><wx w="545"/><wx w="545"/><wx w="545"/><wx w="545"/><wx w="517"/><wx w="274"/><wx w="557"/><wx w="446"/><wx w="559"/><wx w="444"/><wx w="382"/><wx w="698"/><wx w="545"/><wx w="576"/><wx w="498"/><wx w="565"/><wx w="552"/><wx w="727"/><wx w="727"/><wx w="493"/><wx w="493"/><wx w="493"/><wx w="1000"/><wx w="1000"/><wx w="1000"/><wx w="545"/><wx w="667"/><wx w="552"/><wx w="373"/><wx w="557"/><wx w="446"/><wx w="600"/><wx w="461"/><wx w="600"/><wx w="461"/><wx w="573"/><wx w="545"/><wx w="353"/><wx w="599"/><wx w="524"/><wx w="599"/><wx w="524"/><wx w="678"/><wx w="687"/><wx w="698"/><wx w="561"/><wx w="526"/><wx w="561"/><wx w="526"/><wx w="497"/><wx w="228"/><wx w="497"/><wx w="360"/><wx w="497"/><wx w="445"/><wx w="667"/><wx w="557"/><wx w="667"/><wx w="557"/><wx w="707"/><wx w="542"/><wx w="620"/><wx w="360"/><wx w="620"/><wx w="360"/><wx w="557"/><wx w="446"/><wx w="583"/><wx w="334"/><wx w="583"/><wx w="468"/><wx w="655"/><wx w="557"/><wx w="655"/><wx w="557"/><wx w="559"/><wx w="444"/><wx w="559"/><wx w="444"/><wx w="507"/><wx w="707"/><wx w="748"/><wx w="554"/><wx w="542"/><wx w="455"/><wx w="581"/><wx w="466"/><wx w="706"/><wx w="545"/><wx w="558"/><wx w="493"/><wx w="954"/><wx w="730"/><wx w="515"/><wx w="692"/><wx w="293"/><wx w="474"/><wx w="976"/><wx w="323"/><wx w="604"/><wx w="354"/><wx w="354"/><wx w="604"/><wx w="354"/><wx w="599"/><wx w="524"/><wx w="600"/><wx w="461"/><wx w="600"/><wx w="461"/><wx w="561"/><wx w="526"/><wx w="561"/><wx w="526"/><wx w="561"/><wx w="526"/><wx w="667"/><wx w="552"/><wx w="667"/><wx w="552"/><wx w="667"/><wx w="552"/><wx w="675"/><wx w="557"/><wx w="715"/><wx w="578"/><wx w="373"/><wx w="228"/><wx w="373"/><wx w="228"/><wx w="373"/><wx w="228"/><wx w="373"/><wx w="228"/><wx w="416"/><wx w="281"/><wx w="587"/><wx w="498"/><wx w="498"/><wx w="497"/><wx w="228"/><wx w="667"/><wx w="557"/><wx w="667"/><wx w="557"/><wx w="707"/><wx w="542"/><wx w="707"/><wx w="542"/><wx w="620"/><wx w="360"/><wx w="557"/><wx w="446"/><wx w="583"/><wx w="339"/><wx w="655"/><wx w="557"/><wx w="655"/><wx w="557"/><wx w="655"/><wx w="557"/><wx w="655"/><wx w="557"/><wx w="901"/><wx w="742"/><wx w="576"/><wx w="498"/><wx w="253"/><wx w="599"/><wx w="524"/><wx w="913"/><wx w="879"/><wx w="707"/><wx w="542"/><wx w="353"/><wx w="901"/><wx w="742"/><wx w="901"/><wx w="742"/><wx w="901"/><wx w="742"/><wx w="576"/><wx w="498"/><wx w="210"/><wx w="545"/><wx w="545"/><wx w="632"/><wx w="1000"/><wx w="1000"/><wx w="1000"/><wx w="1000"/><wx w="210"/><wx w="545"/><wx w="545"/><wx w="545"/><wx w="599"/><wx w="678"/><wx w="792"/><wx w="485"/><wx w="800"/><wx w="717"/><wx w="799"/><wx w="228"/><wx w="599"/><wx w="589"/><wx w="619"/><wx w="561"/><wx w="559"/><wx w="675"/><wx w="373"/><wx w="587"/><wx w="596"/><wx w="770"/><wx w="667"/><wx w="566"/><wx w="707"/><wx w="675"/><wx w="551"/><wx w="556"/><wx w="583"/><wx w="576"/><wx w="580"/><wx w="793"/><wx w="702"/><wx w="373"/><wx w="576"/><wx w="554"/><wx w="455"/><wx w="557"/><wx w="228"/><wx w="556"/><wx w="555"/><wx w="498"/><wx w="391"/><wx w="557"/><wx w="554"/><wx w="228"/><wx w="498"/><wx w="498"/><wx w="567"/><wx w="498"/><wx w="433"/><wx w="542"/><wx w="551"/><wx w="430"/><wx w="556"/><wx w="497"/><wx w="714"/><wx w="724"/><wx w="228"/><wx w="556"/><wx w="542"/><wx w="556"/><wx w="724"/><wx w="561"/><wx w="718"/><wx w="507"/><wx w="599"/><wx w="557"/><wx w="373"/><wx w="373"/><wx w="416"/><wx w="1001"/><wx w="983"/><wx w="717"/><wx w="602"/><wx w="575"/><wx w="675"/><wx w="599"/><wx w="589"/><wx w="589"/><wx w="507"/><wx w="683"/><wx w="561"/><wx w="894"/><wx w="532"/><wx w="669"/><wx w="669"/><wx w="602"/><wx w="677"/><wx w="770"/><wx w="675"/><wx w="707"/><wx w="675"/><wx w="551"/><wx w="600"/><wx w="583"/><wx w="575"/><wx w="748"/><wx w="580"/><wx w="685"/><wx w="635"/><wx w="943"/><wx w="958"/><wx w="689"/><wx w="788"/><wx w="582"/><wx w="599"/><wx w="951"/><wx w="611"/><wx w="524"/><wx w="549"/><wx w="524"/><wx w="415"/><wx w="558"/><wx w="526"/><wx w="730"/><wx w="457"/><wx w="563"/><wx w="563"/><wx w="498"/><wx w="555"/><wx w="638"/><wx w="562"/><wx w="542"/><wx w="563"/><wx w="552"/><wx w="461"/><wx w="466"/><wx w="498"/><wx w="759"/><wx w="495"/><wx w="571"/><wx w="542"/><wx w="778"/><wx w="790"/><wx w="568"/><wx w="692"/><wx w="500"/><wx w="471"/><wx w="761"/><wx w="527"/><wx w="526"/><wx w="578"/><wx w="415"/><wx w="471"/><wx w="446"/><wx w="228"/><wx w="228"/><wx w="281"/><wx w="826"/><wx w="823"/><wx w="578"/><wx w="498"/><wx w="498"/><wx w="563"/><wx w="507"/><wx w="415"/><wx w="909"/><wx w="1140"/><wx w="563"/><wx w="545"/><wx w="1000"/><wx w="1000"/><wx w="1000"/><wx w="1000"/><wx w="1000"/><wx w="1000"/><wx w="1000"/><wx w="1000"/><wx w="1000"/><wx w="1000"/><wx w="751"/><wx w="562"/><wx w="719"/><wx w="606"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="545"/><wx w="545"/><wx w="545"/><wx w="545"/><wx w="545"/><wx w="545"/><wx w="545"/><wx w="545"/><wx w="545"/><wx w="545"/><wx w="545"/><wx w="545"/><wx w="545"/><wx w="545"/><wx w="545"/><wx w="599"/><wx w="524"/><wx w="599"/><wx w="524"/><wx w="599"/><wx w="524"/><wx w="599"/><wx w="524"/><wx w="599"/><wx w="524"/><wx w="599"/><wx w="524"/><wx w="599"/><wx w="524"/><wx w="599"/><wx w="524"/><wx w="599"/><wx w="524"/><wx w="599"/><wx w="524"/><wx w="599"/><wx w="524"/><wx w="599"/><wx w="524"/><wx w="561"/><wx w="526"/><wx w="561"/><wx w="526"/><wx w="561"/><wx w="526"/><wx w="561"/><wx w="526"/><wx w="561"/><wx w="526"/><wx w="561"/><wx w="526"/><wx w="561"/><wx w="526"/><wx w="561"/><wx w="526"/><wx w="373"/><wx w="228"/><wx w="373"/><wx w="228"/><wx w="0"/><wx w="0"/><wx w="1000"/><wx w="1000"/><wx w="521"/><wx w="521"/><wx w="521"/><wx w="521"/><wx w="521"/><wx w="521"/><wx w="521"/><wx w="521"/><wx w="521"/><wx w="521"/><wx w="521"/><wx w="521"/><wx w="521"/><wx w="382"/><wx w="521"/><wx w="226"/><wx w="521"/><wx w="521"/><wx w="353"/><wx w="672"/><wx w="639"/><wx w="470"/><wx w="600"/><wx w="684"/><wx w="273"/><wx w="311"/><wx w="684"/><wx w="699"/><wx w="273"/><wx w="621"/><wx w="621"/><wx w="621"/><wx w="684"/><wx w="684"/><wx w="361"/><wx w="400"/><wx w="730"/><wx w="648"/><wx w="662"/><wx w="651"/><wx w="476"/><wx w="591"/><wx w="677"/><wx w="569"/><wx w="815"/><wx w="708"/><wx w="547"/><wx w="547"/><wx w="547"/><wx w="210"/><wx w="401"/><wx w="834"/><wx w="273"/><wx w="621"/><wx w="621"/><wx w="621"/><wx w="621"/><wx w="648"/><wx w="815"/><wx w="815"/><wx w="815"/><wx w="815"/><wx w="672"/><wx w="672"/><wx w="672"/><wx w="639"/><wx w="470"/><wx w="600"/><wx w="684"/><wx w="273"/><wx w="349"/><wx w="699"/><wx w="273"/><wx w="621"/><wx w="621"/><wx w="621"/><wx w="684"/><wx w="400"/><wx w="730"/><wx w="662"/><wx w="651"/><wx w="591"/><wx w="677"/><wx w="569"/><wx w="815"/><wx w="708"/><wx w="273"/><wx w="639"/><wx w="621"/><wx w="651"/><wx w="682"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="354"/><wx w="354"/><wx w="474"/><wx w="381"/><wx w="255"/><wx w="279"/><wx w="297"/><wx w="279"/><wx w="279"/><wx w="242"/><wx w="279"/><wx w="347"/><wx w="184"/><wx w="571"/><wx w="571"/><wx w="571"/><wx w="571"/><wx w="571"/><wx w="571"/><wx w="571"/><wx w="571"/><wx w="571"/><wx w="571"/><wx w="571"/><wx w="354"/><wx w="545"/><wx w="410"/><wx w="351"/><wx w="471"/><wx w="354"/><wx w="571"/><wx w="571"/><wx w="571"/><wx w="303"/><wx w="303"/><wx w="303"/><wx w="303"/><wx w="279"/><wx w="301"/><wx w="1000"/><wx w="503"/><wx w="1000"/><wx w="905"/><wx w="410"/><wx w="250"/><wx w="503"/><wx w="250"/><wx w="500"/><wx w="937"/><wx w="1000"/><wx w="905"/><wx w="807"/><wx w="937"/><wx w="279"/><wx w="351"/><wx w="870"/><wx w="889"/><wx w="807"/><wx w="870"/><wx w="608"/><wx w="700"/><wx w="659"/><wx w="680"/><wx w="361"/><wx w="416"/><wx w="923"/><wx w="967"/><wx w="479"/><wx w="532"/><wx w="923"/><wx w="967"/><wx w="479"/><wx w="532"/><wx w="872"/><wx w="997"/><wx w="1000"/><wx w="1000"/><wx w="1000"/><wx w="1000"/><wx w="1000"/><wx w="1000"/><wx w="1000"/><wx w="1000"/><wx w="1000"/><wx w="1000"/><wx w="1000"/><wx w="1000"/><wx w="1000"/><wx w="1000"/><wx w="1000"/><wx w="1000"/><wx w="299"/><wx w="301"/><wx w="299"/><wx w="299"/><wx w="299"/><wx w="707"/><wx w="542"/><wx w="707"/><wx w="542"/><wx w="707"/><wx w="542"/><wx w="707"/><wx w="542"/><wx w="707"/><wx w="542"/><wx w="707"/><wx w="542"/><wx w="707"/><wx w="542"/><wx w="751"/><wx w="562"/><wx w="751"/><wx w="562"/><wx w="751"/><wx w="562"/><wx w="751"/><wx w="562"/><wx w="751"/><wx w="562"/><wx w="655"/><wx w="557"/><wx w="655"/><wx w="557"/><wx w="719"/><wx w="606"/><wx w="719"/><wx w="606"/><wx w="719"/><wx w="606"/><wx w="719"/><wx w="606"/><wx w="719"/><wx w="606"/><wx w="576"/><wx w="498"/><wx w="576"/><wx w="498"/><wx w="576"/><wx w="498"/><wx w="576"/><wx w="498"/><wx w="573"/><wx w="0"/><wx w="382"/><wx w="382"/><wx w="1000"/><wx w="970"/><wx w="381"/><wx w="241"/><wx w="295"/><wx w="241"/><wx w="295"/><wx w="416"/><wx w="443"/><wx w="241"/><wx w="295"/><wx w="872"/><wx w="997"/><wx w="279"/><wx w="351"/><wx w="241"/><wx w="295"/><wx w="807"/><wx w="937"/><wx w="279"/><wx w="351"/><wx w="471"/><wx w="574"/><wx w="807"/><wx w="937"/><wx w="279"/><wx w="351"/><wx w="807"/><wx w="937"/><wx w="279"/><wx w="351"/><wx w="608"/><wx w="700"/><wx w="659"/><wx w="680"/><wx w="608"/><wx w="700"/><wx w="659"/><wx w="680"/><wx w="608"/><wx w="700"/><wx w="659"/><wx w="680"/><wx w="467"/><wx w="545"/><wx w="467"/><wx w="545"/><wx w="361"/><wx w="416"/><wx w="361"/><wx w="416"/><wx w="1209"/><wx w="1294"/><wx w="979"/><wx w="1061"/><wx w="1209"/><wx w="1294"/><wx w="979"/><wx w="1061"/><wx w="1154"/><wx w="1164"/><wx w="757"/><wx w="767"/><wx w="1154"/><wx w="1164"/><wx w="757"/><wx w="767"/><wx w="673"/><wx w="704"/><wx w="673"/><wx w="704"/><wx w="673"/><wx w="704"/><wx w="673"/><wx w="704"/><wx w="605"/><wx w="585"/><wx w="592"/><wx w="482"/><wx w="605"/><wx w="585"/><wx w="592"/><wx w="482"/><wx w="870"/><wx w="905"/><wx w="410"/><wx w="503"/><wx w="870"/><wx w="889"/><wx w="410"/><wx w="503"/><wx w="725"/><wx w="799"/><wx w="479"/><wx w="532"/><wx w="646"/><wx w="723"/><wx w="280"/><wx w="351"/><wx w="590"/><wx w="687"/><wx w="509"/><wx w="606"/><wx w="662"/><wx w="752"/><wx w="279"/><wx w="351"/><wx w="471"/><wx w="574"/><wx w="671"/><wx w="549"/><wx w="416"/><wx w="443"/><wx w="872"/><wx w="997"/><wx w="872"/><wx w="997"/><wx w="279"/><wx w="351"/><wx w="608"/><wx w="709"/><wx w="608"/><wx w="709"/><wx w="608"/><wx w="709"/><wx w="608"/><wx w="709"/><wx w="471"/><wx w="471"/><wx w="574"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="557"/><wx w="446"/><wx w="583"/><wx w="334"/><wx w="526"/><wx w="561"/><wx w="563"/><wx w="669"/><wx w="168"/><wx w="595"/><wx w="612"/><wx w="654"/><wx w="615"/><wx w="615"/><wx w="672"/><wx w="492"/><wx w="556"/><wx w="620"/><wx w="626"/><wx w="687"/><wx w="861"/><wx w="832"/><wx w="621"/><wx w="621"/><wx w="556"/><wx w="809"/><wx w="872"/><wx w="853"/><wx w="615"/><wx w="615"/><wx w="584"/><wx w="715"/><wx w="540"/><wx w="611"/><wx w="629"/><wx w="629"/><wx w="631"/><wx w="631"/><wx w="708"/><wx w="698"/><wx w="621"/><wx w="599"/><wx w="579"/><wx w="429"/><wx w="566"/><wx w="616"/><wx w="621"/><wx w="484"/><wx w="615"/><wx w="744"/><wx w="607"/><wx w="669"/><wx w="714"/><wx w="595"/><wx w="595"/><wx w="528"/><wx w="448"/><wx w="0"/><wx w="484"/><wx w="484"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="588"/><wx w="332"/><wx w="591"/><wx w="492"/><wx w="441"/><wx w="511"/><wx w="484"/><wx w="499"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="602"/><wx w="602"/><wx w="631"/><wx w="685"/><wx w="687"/><wx w="732"/><wx w="732"/><wx w="645"/><wx w="773"/><wx w="773"/><wx w="714"/><wx w="693"/><wx w="1064"/><wx w="581"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="831"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="210"/><wx w="390"/><wx w="279"/><wx w="373"/><wx w="416"/><wx w="228"/><wx w="281"/><wx w="507"/><wx w="415"/><wx w="926"/><wx w="750"/><wx w="633"/><wx w="522"/><wx w="602"/><wx w="498"/><wx w="689"/><wx w="575"/><wx w="576"/><wx w="498"/><wx w="576"/><wx w="498"/><wx w="613"/><wx w="514"/><wx w="635"/><wx w="542"/><wx w="635"/><wx w="542"/><wx w="707"/><wx w="526"/><wx w="707"/><wx w="542"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="0"/><wx w="299"/><wx w="807"/><wx w="937"/><wx w="279"/><wx w="351"/><wx w="467"/><wx w="545"/><wx w="361"/><wx w="416"/><wx w="662"/><wx w="752"/><wx w="520"/><wx w="279"/><wx w="482"/><wx w="520"/><wx w="520"/><wx w="572"/><wx w="455"/><wx w="572"/><wx w="455"/><wx w="255"/><wx w="471"/><wx w="142"/><wx w="715"/><wx w="360"/><wx w="556"/><wx w="545"/><wx w="545"/><wx w="545"/><wx w="545"/><wx w="545"/><wx w="545"/><wx w="545"/><wx w="545"/><wx w="545"/><wx w="545"/><wx w="545"/><wx w="545"/><wx w="545"/><wx w="545"/><wx w="545"/><wx w="545"/><wx w="545"/><wx w="545"/><wx w="545"/><wx w="545"/><wx w="545"/><wx w="545"/><wx w="545"/><wx w="545"/><wx w="545"/><wx w="545"/><wx w="545"/><wx w="545"/><wx w="545"/><wx w="545"/></cid-widths></multibyte-extras><kerning kpx1="79"><pair kern="-8" kpx2="90"/><pair kern="-14" kpx2="8230"/><pair kern="-8" kpx2="89"/><pair kern="-3" kpx2="74"/><pair kern="-22" kpx2="84"/><pair kern="-14" kpx2="46"/><pair kern="-4" kpx2="88"/><pair kern="-14" kpx2="44"/></kerning><kerning kpx1="107"><pair kern="-8" kpx2="111"/><pair kern="-45" kpx2="173"/><pair kern="-8" kpx2="339"/><pair kern="-45" kpx2="8211"/><pair kern="-8" kpx2="248"/><pair kern="-45" kpx2="8212"/><pair kern="-8" kpx2="101"/></kerning><kerning kpx1="8221"><pair kern="-98" kpx2="8230"/><pair kern="-45" kpx2="65"/><pair kern="26" kpx2="87"/><pair kern="19" kpx2="116"/><pair kern="50" kpx2="89"/><pair kern="50" kpx2="84"/><pair kern="-98" kpx2="46"/><pair kern="-45" kpx2="198"/><pair kern="-33" kpx2="115"/><pair kern="45" kpx2="86"/><pair kern="20" kpx2="8217"/><pair kern="-98" kpx2="44"/></kerning><kerning kpx1="123"><pair kern="23" kpx2="106"/><pair kern="9" kpx2="84"/></kerning><kerning kpx1="112"><pair kern="-8" kpx2="8230"/><pair kern="-1" kpx2="121"/><pair kern="-8" kpx2="46"/><pair kern="-14" kpx2="44"/></kerning><kerning kpx1="80"><pair kern="-22" kpx2="111"/><pair kern="-33" kpx2="198"/><pair kern="-22" kpx2="230"/><pair kern="-139" kpx2="44"/><pair kern="-139" kpx2="8230"/><pair kern="-22" kpx2="339"/><pair kern="-22" kpx2="65"/><pair kern="-22" kpx2="97"/><pair kern="-22" kpx2="248"/><pair kern="-34" kpx2="74"/><pair kern="8" kpx2="89"/><pair kern="-139" kpx2="46"/><pair kern="-22" kpx2="101"/></kerning><kerning kpx1="86"><pair kern="-45" kpx2="111"/><pair kern="-37" kpx2="58"/><pair kern="-33" kpx2="198"/><pair kern="-45" kpx2="230"/><pair kern="-22" kpx2="8212"/><pair kern="-134" kpx2="44"/><pair kern="-22" kpx2="173"/><pair kern="-45" kpx2="339"/><pair kern="-134" kpx2="8230"/><pair kern="-26" kpx2="65"/><pair kern="-45" kpx2="97"/><pair kern="-22" kpx2="8211"/><pair kern="-37" kpx2="894"/><pair kern="-45" kpx2="248"/><pair kern="-26" kpx2="117"/><pair kern="-30" kpx2="121"/><pair kern="-134" kpx2="46"/><pair kern="-45" kpx2="101"/></kerning><kerning kpx1="8222"><pair kern="-45" kpx2="87"/><pair kern="-98" kpx2="89"/><pair kern="-98" kpx2="84"/><pair kern="-98" kpx2="86"/></kerning><kerning kpx1="118"><pair kern="-7" kpx2="111"/><pair kern="-19" kpx2="230"/><pair kern="-19" kpx2="8212"/><pair kern="-83" kpx2="44"/><pair kern="15" kpx2="8217"/><pair kern="-19" kpx2="173"/><pair kern="-83" kpx2="8230"/><pair kern="-5" kpx2="339"/><pair kern="-19" kpx2="97"/><pair kern="-19" kpx2="8211"/><pair kern="-7" kpx2="248"/><pair kern="-83" kpx2="46"/><pair kern="-7" kpx2="101"/></kerning><kerning kpx1="73"><pair kern="-9" kpx2="100"/><pair kern="-12" kpx2="111"/><pair kern="-4" kpx2="114"/><pair kern="-12" kpx2="99"/><pair kern="-4" kpx2="112"/><pair kern="-9" kpx2="103"/><pair kern="-14" kpx2="8212"/><pair kern="-15" kpx2="118"/><pair kern="-14" kpx2="173"/><pair kern="-4" kpx2="109"/><pair kern="-9" kpx2="97"/><pair kern="-14" kpx2="8211"/><pair kern="-4" kpx2="110"/><pair kern="-9" kpx2="115"/><pair kern="-12" kpx2="101"/></kerning><kerning kpx1="97"><pair kern="-4" kpx2="119"/><pair kern="-6" kpx2="121"/><pair kern="-6" kpx2="118"/></kerning><kerning kpx1="70"><pair kern="-22" kpx2="111"/><pair kern="-26" kpx2="58"/><pair kern="26" kpx2="63"/><pair kern="-50" kpx2="198"/><pair kern="-45" kpx2="230"/><pair kern="-139" kpx2="44"/><pair kern="-22" kpx2="339"/><pair kern="-139" kpx2="8230"/><pair kern="-45" kpx2="65"/><pair kern="-45" kpx2="97"/><pair kern="-26" kpx2="894"/><pair kern="-22" kpx2="248"/><pair kern="-28" kpx2="74"/><pair kern="14" kpx2="84"/><pair kern="-139" kpx2="46"/><pair kern="-22" kpx2="101"/></kerning><kerning kpx1="85"><pair kern="-8" kpx2="8230"/><pair kern="-4" kpx2="65"/><pair kern="-8" kpx2="46"/><pair kern="-8" kpx2="198"/><pair kern="-8" kpx2="44"/></kerning><kerning kpx1="122"><pair kern="-4" kpx2="111"/><pair kern="-4" kpx2="100"/><pair kern="-8" kpx2="173"/><pair kern="-8" kpx2="8211"/><pair kern="-4" kpx2="231"/><pair kern="-4" kpx2="99"/><pair kern="-4" kpx2="248"/><pair kern="-4" kpx2="103"/><pair kern="-4" kpx2="113"/><pair kern="-8" kpx2="8212"/><pair kern="-4" kpx2="101"/></kerning><kerning kpx1="83"><pair kern="-11" kpx2="83"/><pair kern="1" kpx2="111"/><pair kern="-8" kpx2="119"/><pair kern="1" kpx2="99"/><pair kern="-8" kpx2="198"/><pair kern="2" kpx2="113"/><pair kern="-8" kpx2="44"/><pair kern="-14" kpx2="118"/><pair kern="-8" kpx2="8230"/><pair kern="-6" kpx2="65"/><pair kern="-14" kpx2="121"/><pair kern="-8" kpx2="46"/><pair kern="1" kpx2="101"/></kerning><kerning kpx1="68"><pair kern="-8" kpx2="90"/><pair kern="-22" kpx2="8230"/><pair kern="-8" kpx2="87"/><pair kern="-8" kpx2="89"/><pair kern="-9" kpx2="74"/><pair kern="-22" kpx2="84"/><pair kern="-22" kpx2="46"/><pair kern="-4" kpx2="88"/><pair kern="-22" kpx2="44"/></kerning><kerning kpx1="82"><pair kern="-18" kpx2="111"/><pair kern="-33" kpx2="8221"/><pair kern="-22" kpx2="230"/><pair kern="-45" kpx2="8212"/><pair kern="-33" kpx2="8217"/><pair kern="-45" kpx2="173"/><pair kern="-26" kpx2="339"/><pair kern="-8" kpx2="97"/><pair kern="-45" kpx2="8211"/><pair kern="-5" kpx2="117"/><pair kern="-22" kpx2="248"/><pair kern="-8" kpx2="89"/><pair kern="-26" kpx2="84"/><pair kern="-22" kpx2="121"/><pair kern="-18" kpx2="101"/></kerning><kerning kpx1="75"><pair kern="-27" kpx2="111"/><pair kern="-8" kpx2="79"/><pair kern="-27" kpx2="119"/><pair kern="-8" kpx2="338"/><pair kern="-26" kpx2="230"/><pair kern="-50" kpx2="8212"/><pair kern="-26" kpx2="118"/><pair kern="-50" kpx2="173"/><pair kern="-33" kpx2="339"/><pair kern="-21" kpx2="97"/><pair kern="-50" kpx2="8211"/><pair kern="-20" kpx2="117"/><pair kern="-33" kpx2="248"/><pair kern="-26" kpx2="121"/><pair kern="-8" kpx2="216"/><pair kern="-27" kpx2="101"/></kerning><kerning kpx1="58"><pair kern="-63" kpx2="8212"/></kerning><kerning kpx1="119"><pair kern="-8" kpx2="173"/><pair kern="-33" kpx2="8230"/><pair kern="-8" kpx2="97"/><pair kern="-8" kpx2="8211"/><pair kern="-33" kpx2="46"/><pair kern="-8" kpx2="230"/><pair kern="-8" kpx2="8212"/><pair kern="9" kpx2="8217"/><pair kern="-33" kpx2="44"/></kerning><kerning kpx1="231"><pair kern="-8" kpx2="173"/><pair kern="-8" kpx2="8211"/><pair kern="-8" kpx2="8212"/></kerning><kerning kpx1="8729"><pair kern="-41" kpx2="108"/></kerning><kerning kpx1="8216"><pair kern="-45" kpx2="65"/><pair kern="20" kpx2="8220"/><pair kern="-45" kpx2="198"/></kerning><kerning kpx1="66"><pair kern="4" kpx2="111"/><pair kern="4" kpx2="79"/><pair kern="4" kpx2="119"/><pair kern="4" kpx2="114"/><pair kern="5" kpx2="104"/><pair kern="4" kpx2="67"/><pair kern="5" kpx2="108"/><pair kern="4" kpx2="81"/><pair kern="4" kpx2="8212"/><pair kern="4" kpx2="71"/><pair kern="-8" kpx2="44"/><pair kern="4" kpx2="105"/><pair kern="4" kpx2="173"/><pair kern="-8" kpx2="8230"/><pair kern="4" kpx2="97"/><pair kern="4" kpx2="8211"/><pair kern="4" kpx2="117"/><pair kern="0" kpx2="121"/><pair kern="-26" kpx2="84"/><pair kern="4" kpx2="106"/><pair kern="-8" kpx2="46"/><pair kern="4" kpx2="101"/></kerning><kerning kpx1="103"><pair kern="5" kpx2="106"/></kerning><kerning kpx1="81"><pair kern="-14" kpx2="8230"/><pair kern="-14" kpx2="46"/><pair kern="-14" kpx2="44"/></kerning><kerning kpx1="98"><pair kern="-8" kpx2="8230"/><pair kern="-1" kpx2="121"/><pair kern="-8" kpx2="46"/><pair kern="-14" kpx2="44"/></kerning><kerning kpx1="191"><pair kern="15" kpx2="74"/></kerning><kerning kpx1="44"><pair kern="-43" kpx2="41"/><pair kern="-98" kpx2="8221"/><pair kern="-23" kpx2="55"/><pair kern="-43" kpx2="93"/><pair kern="-43" kpx2="125"/><pair kern="-98" kpx2="8217"/></kerning><kerning kpx1="8230"><pair kern="-98" kpx2="8221"/><pair kern="-98" kpx2="8217"/></kerning><kerning kpx1="64258"><pair kern="1" kpx2="105"/></kerning><kerning kpx1="248"><pair kern="-8" kpx2="8230"/><pair kern="-5" kpx2="121"/><pair kern="-8" kpx2="46"/><pair kern="-8" kpx2="120"/><pair kern="-5" kpx2="118"/><pair kern="-14" kpx2="44"/></kerning><kerning kpx1="102"><pair kern="33" kpx2="8221"/><pair kern="-9" kpx2="99"/><pair kern="-4" kpx2="112"/><pair kern="-12" kpx2="230"/><pair kern="-4" kpx2="113"/><pair kern="-33" kpx2="8212"/><pair kern="41" kpx2="34"/><pair kern="48" kpx2="41"/><pair kern="-12" kpx2="97"/><pair kern="-33" kpx2="8211"/><pair kern="-9" kpx2="233"/><pair kern="-9" kpx2="117"/><pair kern="-9" kpx2="106"/><pair kern="48" kpx2="93"/><pair kern="48" kpx2="125"/><pair kern="33" kpx2="42"/><pair kern="-11" kpx2="115"/><pair kern="-9" kpx2="111"/><pair kern="-4" kpx2="114"/><pair kern="56" kpx2="63"/><pair kern="-4" kpx2="103"/><pair kern="41" kpx2="39"/><pair kern="33" kpx2="8217"/><pair kern="-73" kpx2="44"/><pair kern="-33" kpx2="173"/><pair kern="-56" kpx2="8230"/><pair kern="-4" kpx2="109"/><pair kern="45" kpx2="92"/><pair kern="-9" kpx2="248"/><pair kern="-6" kpx2="102"/><pair kern="59" kpx2="238"/><pair kern="-12" kpx2="121"/><pair kern="-73" kpx2="46"/><pair kern="-4" kpx2="110"/><pair kern="-9" kpx2="101"/></kerning><kerning kpx1="121"><pair kern="-4" kpx2="100"/><pair kern="-7" kpx2="111"/><pair kern="-7" kpx2="99"/><pair kern="-7" kpx2="231"/><pair kern="-4" kpx2="103"/><pair kern="-4" kpx2="113"/><pair kern="-19" kpx2="230"/><pair kern="-19" kpx2="8212"/><pair kern="15" kpx2="8217"/><pair kern="-87" kpx2="44"/><pair kern="-19" kpx2="173"/><pair kern="-5" kpx2="339"/><pair kern="-83" kpx2="8230"/><pair kern="-19" kpx2="97"/><pair kern="-19" kpx2="8211"/><pair kern="-7" kpx2="248"/><pair kern="-87" kpx2="46"/><pair kern="-7" kpx2="101"/></kerning><kerning kpx1="84"><pair kern="-22" kpx2="79"/><pair kern="-102" kpx2="99"/><pair kern="-19" kpx2="199"/><pair kern="-60" kpx2="198"/><pair kern="-110" kpx2="230"/><pair kern="-69" kpx2="8212"/><pair kern="-19" kpx2="71"/><pair kern="-92" kpx2="118"/><pair kern="9" kpx2="41"/><pair kern="-102" kpx2="339"/><pair kern="-56" kpx2="65"/><pair kern="-110" kpx2="97"/><pair kern="-69" kpx2="8211"/><pair kern="-92" kpx2="117"/><pair kern="-22" kpx2="216"/><pair kern="9" kpx2="93"/><pair kern="9" kpx2="125"/><pair kern="-83" kpx2="115"/><pair kern="-79" kpx2="122"/><pair kern="-4" kpx2="83"/><pair kern="-102" kpx2="111"/><pair kern="-92" kpx2="119"/><pair kern="-92" kpx2="58"/><pair kern="-92" kpx2="114"/><pair kern="-22" kpx2="338"/><pair kern="-19" kpx2="67"/><pair kern="26" kpx2="63"/><pair kern="-98" kpx2="103"/><pair kern="-134" kpx2="44"/><pair kern="-69" kpx2="173"/><pair kern="-134" kpx2="8230"/><pair kern="-92" kpx2="894"/><pair kern="-102" kpx2="248"/><pair kern="-28" kpx2="74"/><pair kern="-34" kpx2="89"/><pair kern="-92" kpx2="121"/><pair kern="-48" kpx2="84"/><pair kern="-134" kpx2="46"/><pair kern="-102" kpx2="101"/></kerning><kerning kpx1="8220"><pair kern="-45" kpx2="65"/><pair kern="20" kpx2="8216"/><pair kern="-45" kpx2="198"/></kerning><kerning kpx1="120"><pair kern="-12" kpx2="111"/><pair kern="-4" kpx2="100"/><pair kern="-22" kpx2="173"/><pair kern="-8" kpx2="339"/><pair kern="-22" kpx2="8211"/><pair kern="-8" kpx2="231"/><pair kern="-8" kpx2="99"/><pair kern="-12" kpx2="248"/><pair kern="-4" kpx2="103"/><pair kern="-22" kpx2="8212"/><pair kern="-12" kpx2="101"/></kerning><kerning kpx1="101"><pair kern="-63" kpx2="84"/></kerning><kerning kpx1="40"><pair kern="23" kpx2="106"/><pair kern="9" kpx2="84"/></kerning><kerning kpx1="87"><pair kern="-37" kpx2="111"/><pair kern="-37" kpx2="58"/><pair kern="-18" kpx2="114"/><pair kern="-18" kpx2="198"/><pair kern="-37" kpx2="230"/><pair kern="-22" kpx2="8212"/><pair kern="-134" kpx2="44"/><pair kern="-22" kpx2="173"/><pair kern="-37" kpx2="339"/><pair kern="-102" kpx2="8230"/><pair kern="-22" kpx2="65"/><pair kern="-37" kpx2="97"/><pair kern="-22" kpx2="8211"/><pair kern="-37" kpx2="894"/><pair kern="-37" kpx2="248"/><pair kern="-18" kpx2="117"/><pair kern="-25" kpx2="121"/><pair kern="-102" kpx2="46"/><pair kern="-37" kpx2="101"/></kerning><kerning kpx1="99"><pair kern="-8" kpx2="173"/><pair kern="-8" kpx2="8211"/><pair kern="-2" kpx2="231"/><pair kern="-2" kpx2="99"/><pair kern="-46" kpx2="84"/><pair kern="-8" kpx2="8212"/></kerning><kerning kpx1="104"><pair kern="-4" kpx2="119"/><pair kern="-8" kpx2="121"/><pair kern="-8" kpx2="118"/></kerning><kerning kpx1="199"><pair kern="-22" kpx2="173"/><pair kern="-22" kpx2="8211"/><pair kern="-12" kpx2="338"/><pair kern="-22" kpx2="8212"/></kerning><kerning kpx1="8212"><pair kern="-19" kpx2="122"/><pair kern="-8" kpx2="83"/><pair kern="-4" kpx2="90"/><pair kern="-8" kpx2="119"/><pair kern="-22" kpx2="87"/><pair kern="-22" kpx2="198"/><pair kern="-8" kpx2="230"/><pair kern="-22" kpx2="86"/><pair kern="-19" kpx2="118"/><pair kern="-14" kpx2="73"/><pair kern="-22" kpx2="65"/><pair kern="-8" kpx2="97"/><pair kern="-45" kpx2="74"/><pair kern="-63" kpx2="89"/><pair kern="-19" kpx2="121"/><pair kern="-69" kpx2="84"/><pair kern="-22" kpx2="120"/><pair kern="-37" kpx2="88"/></kerning><kerning kpx1="105"><pair kern="0" kpx2="105"/><pair kern="1" kpx2="102"/><pair kern="1" kpx2="116"/><pair kern="0" kpx2="108"/></kerning><kerning kpx1="65"><pair kern="-1" kpx2="83"/><pair kern="-4" kpx2="119"/><pair kern="-56" kpx2="8221"/><pair kern="-22" kpx2="87"/><pair kern="-22" kpx2="8216"/><pair kern="-22" kpx2="8212"/><pair kern="-26" kpx2="86"/><pair kern="-56" kpx2="8217"/><pair kern="-13" kpx2="118"/><pair kern="-22" kpx2="173"/><pair kern="-22" kpx2="8211"/><pair kern="-4" kpx2="85"/><pair kern="-4" kpx2="117"/><pair kern="-37" kpx2="89"/><pair kern="-6" kpx2="116"/><pair kern="-56" kpx2="84"/><pair kern="-13" kpx2="121"/><pair kern="-22" kpx2="8220"/></kerning><kerning kpx1="8211"><pair kern="-19" kpx2="122"/><pair kern="-8" kpx2="83"/><pair kern="-4" kpx2="90"/><pair kern="-8" kpx2="119"/><pair kern="-22" kpx2="87"/><pair kern="-22" kpx2="198"/><pair kern="-8" kpx2="230"/><pair kern="-22" kpx2="86"/><pair kern="-19" kpx2="118"/><pair kern="-14" kpx2="73"/><pair kern="-22" kpx2="65"/><pair kern="-8" kpx2="97"/><pair kern="-45" kpx2="74"/><pair kern="-63" kpx2="89"/><pair kern="-19" kpx2="121"/><pair kern="-69" kpx2="84"/><pair kern="-22" kpx2="120"/><pair kern="-37" kpx2="88"/></kerning><kerning kpx1="33"><pair kern="-45" kpx2="8221"/><pair kern="-45" kpx2="8217"/></kerning><kerning kpx1="116"><pair kern="-19" kpx2="173"/><pair kern="8" kpx2="8221"/><pair kern="-19" kpx2="8211"/><pair kern="-7" kpx2="116"/><pair kern="-9" kpx2="121"/><pair kern="-19" kpx2="8212"/><pair kern="8" kpx2="8217"/><pair kern="-9" kpx2="118"/></kerning><kerning kpx1="216"><pair kern="-8" kpx2="90"/><pair kern="-14" kpx2="8230"/><pair kern="-8" kpx2="89"/><pair kern="-22" kpx2="84"/><pair kern="-14" kpx2="46"/><pair kern="-4" kpx2="88"/><pair kern="-14" kpx2="44"/></kerning><kerning kpx1="52"><pair kern="-9" kpx2="46"/><pair kern="-9" kpx2="44"/></kerning><kerning kpx1="88"><pair kern="-21" kpx2="111"/><pair kern="-4" kpx2="79"/><pair kern="-4" kpx2="338"/><pair kern="-4" kpx2="67"/><pair kern="-4" kpx2="199"/><pair kern="-22" kpx2="230"/><pair kern="-37" kpx2="8212"/><pair kern="-4" kpx2="71"/><pair kern="-37" kpx2="173"/><pair kern="-26" kpx2="339"/><pair kern="-18" kpx2="97"/><pair kern="-37" kpx2="8211"/><pair kern="-14" kpx2="117"/><pair kern="-26" kpx2="248"/><pair kern="-32" kpx2="121"/><pair kern="-4" kpx2="216"/><pair kern="-21" kpx2="101"/></kerning><kerning kpx1="64257"><pair kern="1" kpx2="108"/></kerning><kerning kpx1="90"><pair kern="-4" kpx2="90"/><pair kern="-26" kpx2="111"/><pair kern="-8" kpx2="79"/><pair kern="-19" kpx2="119"/><pair kern="-8" kpx2="338"/><pair kern="-8" kpx2="67"/><pair kern="-8" kpx2="199"/><pair kern="-22" kpx2="230"/><pair kern="-22" kpx2="8212"/><pair kern="-8" kpx2="71"/><pair kern="-26" kpx2="173"/><pair kern="-26" kpx2="339"/><pair kern="-22" kpx2="97"/><pair kern="-22" kpx2="8211"/><pair kern="-26" kpx2="248"/><pair kern="-30" kpx2="121"/><pair kern="-8" kpx2="216"/><pair kern="-26" kpx2="101"/></kerning><kerning kpx1="111"><pair kern="-8" kpx2="8230"/><pair kern="-5" kpx2="121"/><pair kern="-8" kpx2="46"/><pair kern="-8" kpx2="120"/><pair kern="-5" kpx2="118"/><pair kern="-14" kpx2="44"/></kerning><kerning kpx1="239"><pair kern="6" kpx2="64257"/><pair kern="6" kpx2="64258"/><pair kern="6" kpx2="102"/><pair kern="4" kpx2="108"/></kerning><kerning kpx1="55"><pair kern="-73" kpx2="46"/><pair kern="-73" kpx2="44"/></kerning><kerning kpx1="114"><pair kern="-4" kpx2="100"/><pair kern="-4" kpx2="111"/><pair kern="14" kpx2="8221"/><pair kern="-4" kpx2="99"/><pair kern="-4" kpx2="231"/><pair kern="-4" kpx2="103"/><pair kern="-4" kpx2="113"/><pair kern="-19" kpx2="230"/><pair kern="-8" kpx2="8212"/><pair kern="14" kpx2="8217"/><pair kern="-134" kpx2="44"/><pair kern="-12" kpx2="173"/><pair kern="-4" kpx2="339"/><pair kern="-134" kpx2="8230"/><pair kern="-17" kpx2="97"/><pair kern="-8" kpx2="8211"/><pair kern="-4" kpx2="248"/><pair kern="-4" kpx2="233"/><pair kern="-134" kpx2="46"/><pair kern="-4" kpx2="101"/></kerning><kerning kpx1="67"><pair kern="-22" kpx2="173"/><pair kern="-22" kpx2="8211"/><pair kern="-12" kpx2="338"/><pair kern="-22" kpx2="8212"/></kerning><kerning kpx1="8218"><pair kern="-45" kpx2="87"/><pair kern="-98" kpx2="89"/><pair kern="-98" kpx2="84"/><pair kern="-98" kpx2="86"/></kerning><kerning kpx1="91"><pair kern="23" kpx2="106"/><pair kern="9" kpx2="84"/></kerning><kerning kpx1="108"><pair kern="0" kpx2="105"/><pair kern="4" kpx2="239"/><pair kern="-41" kpx2="8729"/><pair kern="0" kpx2="102"/><pair kern="1" kpx2="116"/><pair kern="4" kpx2="238"/><pair kern="2" kpx2="108"/></kerning><kerning kpx1="76"><pair kern="-8" kpx2="79"/><pair kern="-74" kpx2="8221"/><pair kern="-45" kpx2="87"/><pair kern="-8" kpx2="338"/><pair kern="-8" kpx2="199"/><pair kern="-8" kpx2="67"/><pair kern="-20" kpx2="198"/><pair kern="-56" kpx2="39"/><pair kern="-8" kpx2="81"/><pair kern="-74" kpx2="8212"/><pair kern="-8" kpx2="71"/><pair kern="-50" kpx2="86"/><pair kern="-74" kpx2="8217"/><pair kern="-50" kpx2="118"/><pair kern="-74" kpx2="173"/><pair kern="-20" kpx2="65"/><pair kern="-74" kpx2="8211"/><pair kern="45" kpx2="74"/><pair kern="-74" kpx2="89"/><pair kern="-8" kpx2="216"/><pair kern="-50" kpx2="121"/><pair kern="-79" kpx2="84"/></kerning><kerning kpx1="39"><pair kern="-45" kpx2="65"/><pair kern="-45" kpx2="198"/></kerning><kerning kpx1="8217"><pair kern="9" kpx2="51"/><pair kern="20" kpx2="8221"/><pair kern="26" kpx2="87"/><pair kern="20" kpx2="104"/><pair kern="-45" kpx2="198"/><pair kern="45" kpx2="86"/><pair kern="20" kpx2="105"/><pair kern="4" kpx2="53"/><pair kern="-45" kpx2="65"/><pair kern="19" kpx2="116"/><pair kern="-34" kpx2="52"/><pair kern="-33" kpx2="115"/><pair kern="9" kpx2="83"/><pair kern="78" kpx2="239"/><pair kern="20" kpx2="55"/><pair kern="87" kpx2="8216"/><pair kern="9" kpx2="50"/><pair kern="20" kpx2="108"/><pair kern="39" kpx2="236"/><pair kern="-98" kpx2="44"/><pair kern="-98" kpx2="8230"/><pair kern="50" kpx2="89"/><pair kern="50" kpx2="84"/><pair kern="78" kpx2="238"/><pair kern="87" kpx2="8220"/><pair kern="9" kpx2="57"/><pair kern="-98" kpx2="46"/><pair kern="9" kpx2="56"/></kerning><kerning kpx1="237"><pair kern="9" kpx2="8217"/></kerning><kerning kpx1="173"><pair kern="-19" kpx2="122"/><pair kern="-8" kpx2="83"/><pair kern="-14" kpx2="90"/><pair kern="-8" kpx2="119"/><pair kern="-22" kpx2="87"/><pair kern="-22" kpx2="198"/><pair kern="-8" kpx2="230"/><pair kern="-22" kpx2="86"/><pair kern="-19" kpx2="118"/><pair kern="-14" kpx2="73"/><pair kern="-22" kpx2="65"/><pair kern="-8" kpx2="97"/><pair kern="-45" kpx2="74"/><pair kern="-63" kpx2="89"/><pair kern="-19" kpx2="121"/><pair kern="-69" kpx2="84"/><pair kern="-22" kpx2="120"/><pair kern="-37" kpx2="88"/></kerning><kerning kpx1="109"><pair kern="-4" kpx2="119"/><pair kern="-8" kpx2="121"/><pair kern="-8" kpx2="118"/></kerning><kerning kpx1="74"><pair kern="-8" kpx2="8230"/><pair kern="-4" kpx2="65"/><pair kern="-8" kpx2="46"/><pair kern="-4" kpx2="198"/><pair kern="-8" kpx2="44"/></kerning><kerning kpx1="89"><pair kern="-8" kpx2="79"/><pair kern="-45" kpx2="112"/><pair kern="-37" kpx2="198"/><pair kern="-60" kpx2="113"/><pair kern="-63" kpx2="230"/><pair kern="-63" kpx2="8212"/><pair kern="-45" kpx2="118"/><pair kern="-60" kpx2="339"/><pair kern="-63" kpx2="97"/><pair kern="-37" kpx2="65"/><pair kern="-63" kpx2="8211"/><pair kern="-50" kpx2="117"/><pair kern="-8" kpx2="216"/><pair kern="-50" kpx2="115"/><pair kern="-56" kpx2="100"/><pair kern="-60" kpx2="111"/><pair kern="-92" kpx2="58"/><pair kern="-45" kpx2="114"/><pair kern="-8" kpx2="338"/><pair kern="-60" kpx2="103"/><pair kern="-134" kpx2="44"/><pair kern="-63" kpx2="173"/><pair kern="-134" kpx2="8230"/><pair kern="-45" kpx2="109"/><pair kern="-92" kpx2="894"/><pair kern="-60" kpx2="248"/><pair kern="-28" kpx2="74"/><pair kern="-134" kpx2="46"/><pair kern="-45" kpx2="110"/><pair kern="-60" kpx2="101"/></kerning><kerning kpx1="238"><pair kern="4" kpx2="108"/></kerning><kerning kpx1="46"><pair kern="-79" kpx2="173"/><pair kern="-48" kpx2="41"/><pair kern="-98" kpx2="8221"/><pair kern="-23" kpx2="55"/><pair kern="-56" kpx2="8211"/><pair kern="-48" kpx2="93"/><pair kern="-48" kpx2="125"/><pair kern="-56" kpx2="8212"/><pair kern="-98" kpx2="8217"/><pair kern="-64" kpx2="44"/></kerning><kerning kpx1="110"><pair kern="-4" kpx2="119"/><pair kern="-8" kpx2="121"/><pair kern="-8" kpx2="118"/></kerning></font-metrics>
\ No newline at end of file
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/tahomabd.ttf b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/tahomabd.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..9a1391f1b706f0d35a7ce75c427336fb50348a31
Binary files /dev/null and b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/tahomabd.ttf differ
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/times.ttf b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/times.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..90c8c9f8e5ea3574f1c99dc9dc9810029c3c7ab6
Binary files /dev/null and b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/times.ttf differ
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/timesbd.ttf b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/timesbd.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..021660f755a7725751379d2e2e576d988973b476
Binary files /dev/null and b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/timesbd.ttf differ
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/timesbi.ttf b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/timesbi.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..07ab7a0b62c3f5130ed1314899af1ff9182aa0c5
Binary files /dev/null and b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/timesbi.ttf differ
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/timesi.ttf b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/timesi.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..ee4367352aab23676f0912507fd997f42b6adfba
Binary files /dev/null and b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/timesi.ttf differ
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/trebuc.ttf b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/trebuc.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..95e08e8363c15f81951af929c98f4b4b1db0a828
Binary files /dev/null and b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/trebuc.ttf differ
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/trebuc.xml b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/trebuc.xml
new file mode 100755
index 0000000000000000000000000000000000000000..2a303832cb6c7c806961a2fb66319e0da5bf3813
--- /dev/null
+++ b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/trebuc.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><font-metrics metrics-version="2" type="TYPE0"><font-name>TrebuchetMS</font-name><embed/><cap-height>715</cap-height><x-height>522</x-height><ascender>737</ascender><descender>-205</descender><bbox><left>-85</left><bottom>-262</bottom><right>958</right><top>938</top></bbox><flags>33</flags><stemv>0</stemv><italicangle>0</italicangle><subtype>TYPE0</subtype><multibyte-extras><cid-type>CIDFontType2</cid-type><default-width>0</default-width><bfranges><bf gi="3" ue="126" us="32"/><bf gi="172" ue="160" us="160"/><bf gi="163" ue="161" us="161"/><bf gi="132" ue="163" us="162"/><bf gi="308" ue="164" us="164"/><bf gi="150" ue="165" us="165"/><bf gi="232" ue="166" us="166"/><bf gi="134" ue="167" us="167"/><bf gi="142" ue="168" us="168"/><bf gi="139" ue="169" us="169"/><bf gi="157" ue="170" us="170"/><bf gi="169" ue="171" us="171"/><bf gi="164" ue="172" us="172"/><bf gi="250" ue="173" us="173"/><bf gi="138" ue="174" us="174"/><bf gi="264" ue="175" us="175"/><bf gi="131" ue="176" us="176"/><bf gi="147" ue="177" us="177"/><bf gi="240" ue="179" us="178"/><bf gi="141" ue="180" us="180"/><bf gi="245" ue="181" us="181"/><bf gi="136" ue="182" us="182"/><bf gi="266" ue="183" us="183"/><bf gi="222" ue="184" us="184"/><bf gi="239" ue="185" us="185"/><bf gi="158" ue="186" us="186"/><bf gi="170" ue="187" us="187"/><bf gi="243" ue="188" us="188"/><bf gi="242" ue="189" us="189"/><bf gi="244" ue="190" us="190"/><bf gi="162" ue="191" us="191"/><bf gi="173" ue="192" us="192"/><bf gi="201" ue="193" us="193"/><bf gi="199" ue="194" us="194"/><bf gi="174" ue="195" us="195"/><bf gi="98" ue="197" us="196"/><bf gi="144" ue="198" us="198"/><bf gi="100" ue="199" us="199"/><bf gi="203" ue="200" us="200"/><bf gi="101" ue="201" us="201"/><bf gi="200" ue="202" us="202"/><bf gi="202" ue="203" us="203"/><bf gi="207" ue="204" us="204"/><bf gi="204" ue="207" us="205"/><bf gi="233" ue="208" us="208"/><bf gi="102" ue="209" us="209"/><bf gi="211" ue="210" us="210"/><bf gi="208" ue="212" us="211"/><bf gi="175" ue="213" us="213"/><bf gi="103" ue="214" us="214"/><bf gi="249" ue="215" us="215"/><bf gi="145" ue="216" us="216"/><bf gi="214" ue="217" us="217"/><bf gi="212" ue="219" us="218"/><bf gi="104" ue="220" us="220"/><bf gi="235" ue="222" us="221"/><bf gi="137" ue="223" us="223"/><bf gi="106" ue="224" us="224"/><bf gi="105" ue="225" us="225"/><bf gi="107" ue="226" us="226"/><bf gi="109" ue="227" us="227"/><bf gi="108" ue="228" us="228"/><bf gi="110" ue="229" us="229"/><bf gi="160" ue="230" us="230"/><bf gi="111" ue="231" us="231"/><bf gi="113" ue="232" us="232"/><bf gi="112" ue="233" us="233"/><bf gi="114" ue="235" us="234"/><bf gi="117" ue="236" us="236"/><bf gi="116" ue="237" us="237"/><bf gi="118" ue="239" us="238"/><bf gi="234" ue="240" us="240"/><bf gi="120" ue="241" us="241"/><bf gi="122" ue="242" us="242"/><bf gi="121" ue="243" us="243"/><bf gi="123" ue="244" us="244"/><bf gi="125" ue="245" us="245"/><bf gi="124" ue="246" us="246"/><bf gi="184" ue="247" us="247"/><bf gi="161" ue="248" us="248"/><bf gi="127" ue="249" us="249"/><bf gi="126" ue="250" us="250"/><bf gi="128" ue="252" us="251"/><bf gi="248" ue="253" us="253"/><bf gi="237" ue="254" us="254"/><bf gi="186" ue="255" us="255"/><bf gi="267" ue="261" us="258"/><bf gi="259" ue="263" us="262"/><bf gi="261" ue="269" us="268"/><bf gi="271" ue="272" us="270"/><bf gi="263" ue="273" us="273"/><bf gi="274" ue="283" us="280"/><bf gi="254" ue="287" us="286"/><bf gi="256" ue="304" us="304"/><bf gi="215" ue="305" us="305"/><bf gi="278" ue="314" us="313"/><bf gi="280" ue="320" us="317"/><bf gi="226" ue="322" us="321"/><bf gi="284" ue="324" us="323"/><bf gi="286" ue="328" us="327"/><bf gi="288" ue="337" us="336"/><bf gi="176" ue="339" us="338"/><bf gi="290" ue="341" us="340"/><bf gi="292" ue="347" us="344"/><bf gi="257" ue="351" us="350"/><bf gi="228" ue="353" us="352"/><bf gi="296" ue="357" us="354"/><bf gi="300" ue="369" us="366"/><bf gi="187" ue="376" us="376"/><bf gi="304" ue="380" us="377"/><bf gi="230" ue="382" us="381"/><bf gi="166" ue="402" us="402"/><bf gi="216" ue="710" us="710"/><bf gi="225" ue="711" us="711"/><bf gi="218" ue="713" us="713"/><bf gi="219" ue="730" us="728"/><bf gi="224" ue="731" us="731"/><bf gi="217" ue="732" us="732"/><bf gi="223" ue="733" us="733"/><bf gi="168" ue="916" us="916"/><bf gi="159" ue="937" us="937"/><bf gi="151" ue="956" us="956"/><bf gi="155" ue="960" us="960"/><bf gi="16" ue="8208" us="8208"/><bf gi="178" ue="8212" us="8211"/><bf gi="182" ue="8217" us="8216"/><bf gi="196" ue="8218" us="8218"/><bf gi="180" ue="8221" us="8220"/><bf gi="197" ue="8222" us="8222"/><bf gi="130" ue="8224" us="8224"/><bf gi="194" ue="8225" us="8225"/><bf gi="135" ue="8226" us="8226"/><bf gi="171" ue="8230" us="8230"/><bf gi="198" ue="8240" us="8240"/><bf gi="190" ue="8250" us="8249"/><bf gi="188" ue="8260" us="8260"/><bf gi="253" ue="8355" us="8355"/><bf gi="189" ue="8364" us="8364"/><bf gi="140" ue="8482" us="8482"/><bf gi="246" ue="8486" us="8486"/><bf gi="152" ue="8706" us="8706"/><bf gi="247" ue="8710" us="8710"/><bf gi="154" ue="8719" us="8719"/><bf gi="153" ue="8721" us="8721"/><bf gi="238" ue="8722" us="8722"/><bf gi="188" ue="8725" us="8725"/><bf gi="195" ue="8729" us="8729"/><bf gi="165" ue="8730" us="8730"/><bf gi="146" ue="8734" us="8734"/><bf gi="156" ue="8747" us="8747"/><bf gi="167" ue="8776" us="8776"/><bf gi="143" ue="8800" us="8800"/><bf gi="148" ue="8805" us="8804"/><bf gi="185" ue="9674" us="9674"/><bf gi="210" ue="61440" us="61440"/><bf gi="192" ue="61442" us="61441"/><bf gi="265" ue="61445" us="61445"/><bf gi="251" ue="61447" us="61446"/><bf gi="192" ue="64258" us="64257"/><bf gi="0" ue="65535" us="65535"/></bfranges><cid-widths start-index="0"><wx w="500"/><wx w="0"/><wx w="367"/><wx w="301"/><wx w="367"/><wx w="324"/><wx w="524"/><wx w="524"/><wx w="600"/><wx w="706"/><wx w="159"/><wx w="367"/><wx w="367"/><wx w="367"/><wx w="524"/><wx w="367"/><wx w="367"/><wx w="367"/><wx w="524"/><wx w="524"/><wx w="524"/><wx w="524"/><wx w="524"/><wx w="524"/><wx w="524"/><wx w="524"/><wx w="524"/><wx w="524"/><wx w="524"/><wx w="367"/><wx w="367"/><wx w="524"/><wx w="524"/><wx w="524"/><wx w="367"/><wx w="770"/><wx w="589"/><wx w="565"/><wx w="598"/><wx w="613"/><wx w="535"/><wx w="524"/><wx w="676"/><wx w="654"/><wx w="278"/><wx w="476"/><wx w="575"/><wx w="506"/><wx w="709"/><wx w="638"/><wx w="673"/><wx w="557"/><wx w="675"/><wx w="582"/><wx w="480"/><wx w="580"/><wx w="648"/><wx w="587"/><wx w="852"/><wx w="556"/><wx w="570"/><wx w="550"/><wx w="367"/><wx w="355"/><wx w="367"/><wx w="524"/><wx w="524"/><wx w="524"/><wx w="525"/><wx w="557"/><wx w="495"/><wx w="557"/><wx w="545"/><wx w="369"/><wx w="501"/><wx w="546"/><wx w="285"/><wx w="366"/><wx w="504"/><wx w="294"/><wx w="830"/><wx w="546"/><wx w="536"/><wx w="557"/><wx w="557"/><wx w="388"/><wx w="404"/><wx w="396"/><wx w="546"/><wx w="489"/><wx w="744"/><wx w="500"/><wx w="493"/><wx w="474"/><wx w="367"/><wx w="524"/><wx w="367"/><wx w="524"/><wx w="589"/><wx w="589"/><wx w="598"/><wx w="535"/><wx w="638"/><wx w="673"/><wx w="648"/><wx w="525"/><wx w="525"/><wx w="525"/><wx w="525"/><wx w="525"/><wx w="525"/><wx w="495"/><wx w="545"/><wx w="545"/><wx w="545"/><wx w="545"/><wx w="285"/><wx w="285"/><wx w="285"/><wx w="285"/><wx w="546"/><wx w="536"/><wx w="536"/><wx w="536"/><wx w="536"/><wx w="536"/><wx w="546"/><wx w="546"/><wx w="546"/><wx w="546"/><wx w="458"/><wx w="524"/><wx w="524"/><wx w="524"/><wx w="453"/><wx w="524"/><wx w="524"/><wx w="546"/><wx w="712"/><wx w="712"/><wx w="634"/><wx w="524"/><wx w="524"/><wx w="524"/><wx w="866"/><wx w="656"/><wx w="524"/><wx w="524"/><wx w="524"/><wx w="524"/><wx w="570"/><wx w="546"/><wx w="549"/><wx w="524"/><wx w="552"/><wx w="601"/><wx w="524"/><wx w="367"/><wx w="367"/><wx w="668"/><wx w="873"/><wx w="545"/><wx w="367"/><wx w="367"/><wx w="524"/><wx w="524"/><wx w="388"/><wx w="524"/><wx w="584"/><wx w="524"/><wx w="524"/><wx w="734"/><wx w="301"/><wx w="589"/><wx w="589"/><wx w="673"/><wx w="993"/><wx w="924"/><wx w="367"/><wx w="734"/><wx w="524"/><wx w="524"/><wx w="367"/><wx w="367"/><wx w="524"/><wx w="494"/><wx w="493"/><wx w="570"/><wx w="528"/><wx w="524"/><wx w="367"/><wx w="367"/><wx w="579"/><wx w="600"/><wx w="458"/><wx w="367"/><wx w="367"/><wx w="524"/><wx w="912"/><wx w="589"/><wx w="535"/><wx w="589"/><wx w="535"/><wx w="535"/><wx w="278"/><wx w="278"/><wx w="278"/><wx w="278"/><wx w="673"/><wx w="673"/><wx w="501"/><wx w="673"/><wx w="648"/><wx w="648"/><wx w="648"/><wx w="285"/><wx w="524"/><wx w="524"/><wx w="524"/><wx w="524"/><wx w="524"/><wx w="524"/><wx w="524"/><wx w="524"/><wx w="524"/><wx w="524"/><wx w="506"/><wx w="297"/><wx w="480"/><wx w="404"/><wx w="550"/><wx w="474"/><wx w="524"/><wx w="613"/><wx w="549"/><wx w="570"/><wx w="555"/><wx w="553"/><wx w="524"/><wx w="451"/><wx w="451"/><wx w="453"/><wx w="814"/><wx w="814"/><wx w="814"/><wx w="546"/><wx w="668"/><wx w="584"/><wx w="493"/><wx w="524"/><wx w="367"/><wx w="366"/><wx w="367"/><wx w="524"/><wx w="676"/><wx w="501"/><wx w="278"/><wx w="480"/><wx w="404"/><wx w="598"/><wx w="495"/><wx w="598"/><wx w="495"/><wx w="557"/><wx w="524"/><wx w="367"/><wx w="367"/><wx w="589"/><wx w="525"/><wx w="589"/><wx w="525"/><wx w="613"/><wx w="691"/><wx w="613"/><wx w="535"/><wx w="545"/><wx w="535"/><wx w="545"/><wx w="506"/><wx w="294"/><wx w="506"/><wx w="344"/><wx w="506"/><wx w="329"/><wx w="638"/><wx w="546"/><wx w="638"/><wx w="546"/><wx w="673"/><wx w="536"/><wx w="582"/><wx w="388"/><wx w="582"/><wx w="388"/><wx w="480"/><wx w="404"/><wx w="580"/><wx w="396"/><wx w="580"/><wx w="496"/><wx w="648"/><wx w="546"/><wx w="648"/><wx w="546"/><wx w="550"/><wx w="474"/><wx w="550"/><wx w="474"/><wx w="524"/></cid-widths></multibyte-extras><kerning kpx1="119"><pair kern="-105" kpx2="46"/><pair kern="-105" kpx2="44"/></kerning><kerning kpx1="75"><pair kern="-31" kpx2="111"/><pair kern="-31" kpx2="105"/><pair kern="-31" kpx2="119"/><pair kern="-31" kpx2="117"/><pair kern="-31" kpx2="110"/><pair kern="-31" kpx2="101"/></kerning><kerning kpx1="82"><pair kern="-40" kpx2="111"/><pair kern="-63" kpx2="87"/><pair kern="-28" kpx2="117"/><pair kern="-63" kpx2="89"/><pair kern="-41" kpx2="84"/><pair kern="-45" kpx2="86"/><pair kern="-40" kpx2="101"/></kerning><kerning kpx1="114"><pair kern="-133" kpx2="46"/><pair kern="-13" kpx2="8217"/><pair kern="-142" kpx2="44"/></kerning><kerning kpx1="87"><pair kern="-45" kpx2="111"/><pair kern="-18" kpx2="58"/><pair kern="-50" kpx2="114"/><pair kern="-92" kpx2="44"/><pair kern="-18" kpx2="59"/><pair kern="-13" kpx2="105"/><pair kern="-87" kpx2="65"/><pair kern="-55" kpx2="97"/><pair kern="-41" kpx2="117"/><pair kern="-18" kpx2="121"/><pair kern="-92" kpx2="46"/><pair kern="-68" kpx2="8208"/><pair kern="-45" kpx2="101"/></kerning><kerning kpx1="8216"><pair kern="-96" kpx2="8216"/></kerning><kerning kpx1="80"><pair kern="-46" kpx2="111"/><pair kern="-18" kpx2="32"/><pair kern="-46" kpx2="105"/><pair kern="-46" kpx2="114"/><pair kern="-46" kpx2="97"/><pair kern="-111" kpx2="65"/><pair kern="-46" kpx2="104"/><pair kern="-195" kpx2="46"/><pair kern="-46" kpx2="101"/><pair kern="-195" kpx2="44"/></kerning><kerning kpx1="76"><pair kern="-37" kpx2="32"/><pair kern="-125" kpx2="87"/><pair kern="-129" kpx2="89"/><pair kern="-83" kpx2="121"/><pair kern="-102" kpx2="84"/><pair kern="-138" kpx2="86"/><pair kern="-101" kpx2="8217"/></kerning><kerning kpx1="86"><pair kern="-64" kpx2="111"/><pair kern="-60" kpx2="58"/><pair kern="-60" kpx2="114"/><pair kern="-146" kpx2="44"/><pair kern="-60" kpx2="59"/><pair kern="-18" kpx2="105"/><pair kern="-102" kpx2="65"/><pair kern="-78" kpx2="97"/><pair kern="-64" kpx2="117"/><pair kern="-37" kpx2="121"/><pair kern="-146" kpx2="46"/><pair kern="-73" kpx2="8208"/><pair kern="-64" kpx2="101"/></kerning><kerning kpx1="8217"><pair kern="-37" kpx2="32"/><pair kern="-68" kpx2="115"/><pair kern="-96" kpx2="8217"/></kerning><kerning kpx1="118"><pair kern="-134" kpx2="46"/><pair kern="-134" kpx2="44"/></kerning><kerning kpx1="32"><pair kern="-55" kpx2="65"/><pair kern="-18" kpx2="89"/><pair kern="-18" kpx2="84"/></kerning><kerning kpx1="65"><pair kern="-55" kpx2="32"/><pair kern="-45" kpx2="119"/><pair kern="-87" kpx2="87"/><pair kern="-106" kpx2="89"/><pair kern="-41" kpx2="121"/><pair kern="-97" kpx2="84"/><pair kern="-87" kpx2="86"/><pair kern="-111" kpx2="8217"/><pair kern="-55" kpx2="118"/></kerning><kerning kpx1="70"><pair kern="-105" kpx2="65"/><pair kern="-180" kpx2="46"/><pair kern="-180" kpx2="44"/></kerning><kerning kpx1="102"><pair kern="-23" kpx2="8217"/></kerning><kerning kpx1="89"><pair kern="-114" kpx2="111"/><pair kern="-87" kpx2="58"/><pair kern="-92" kpx2="112"/><pair kern="-119" kpx2="113"/><pair kern="-59" kpx2="118"/><pair kern="-161" kpx2="44"/><pair kern="-87" kpx2="59"/><pair kern="-18" kpx2="32"/><pair kern="-55" kpx2="105"/><pair kern="-106" kpx2="65"/><pair kern="-92" kpx2="97"/><pair kern="-73" kpx2="117"/><pair kern="-161" kpx2="46"/><pair kern="-122" kpx2="8208"/><pair kern="-104" kpx2="101"/></kerning><kerning kpx1="121"><pair kern="-122" kpx2="46"/><pair kern="-122" kpx2="44"/></kerning><kerning kpx1="84"><pair kern="-124" kpx2="111"/><pair kern="-55" kpx2="79"/><pair kern="-138" kpx2="119"/><pair kern="-110" kpx2="58"/><pair kern="-109" kpx2="114"/><pair kern="-124" kpx2="99"/><pair kern="-166" kpx2="44"/><pair kern="-110" kpx2="59"/><pair kern="-18" kpx2="32"/><pair kern="-41" kpx2="105"/><pair kern="-97" kpx2="65"/><pair kern="-124" kpx2="97"/><pair kern="-129" kpx2="117"/><pair kern="-115" kpx2="121"/><pair kern="-166" kpx2="46"/><pair kern="-96" kpx2="8208"/><pair kern="-120" kpx2="115"/><pair kern="-124" kpx2="101"/></kerning></font-metrics>
\ No newline at end of file
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/trebucbd.ttf b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/trebucbd.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..5df79b2e1ebf4617cca94dabb998e5ee5ce32a51
Binary files /dev/null and b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/trebucbd.ttf differ
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/trebucbi.ttf b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/trebucbi.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..c8d5519ac2cb2e4aaf5a6a822af99fb246d07c01
Binary files /dev/null and b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/trebucbi.ttf differ
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/trebucit.ttf b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/trebucit.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..529f3afd98008a1a413483385ee486d47f1e3fb1
Binary files /dev/null and b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/trebucit.ttf differ
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/verdana.ttf b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/verdana.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..754a9b7b39381cc790f17f470212252974904dd7
Binary files /dev/null and b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/verdana.ttf differ
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/verdanab.ttf b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/verdanab.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..a668f13bafcbc24e1ad25915cf130e579f5a6fb4
Binary files /dev/null and b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/verdanab.ttf differ
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/verdanai.ttf b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/verdanai.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..fedb5134de291ab8db392cc40836b972da051502
Binary files /dev/null and b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/verdanai.ttf differ
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/verdanaz.ttf b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/verdanaz.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..8be20913b2db6be6704b551c8696789718876e35
Binary files /dev/null and b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/verdanaz.ttf differ
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/webdings.ttf b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/webdings.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..511a319b0f55f903f271430ef7efb60ee6de203a
Binary files /dev/null and b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/webdings.ttf differ
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/wingding.ttf b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/wingding.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..42a25d6d1020f343cf1142aab79f5f5444e70cbb
Binary files /dev/null and b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/wingding.ttf differ
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/wingdng2.ttf b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/wingdng2.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..c6937a089d854a42dcc03d003391e70bc1965b6f
Binary files /dev/null and b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/wingdng2.ttf differ
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/wingdng3.ttf b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/wingdng3.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..963f9dd942d9b40259e9b416b8477ce549107e60
Binary files /dev/null and b/src/module_vm4ms/web_service/ws_data/vm4ms/map/fonts/wingdng3.ttf differ
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/symbols/legende_Divers/evenement.png b/src/module_vm4ms/web_service/ws_data/vm4ms/map/symbols/legende_Divers/evenement.png
new file mode 100755
index 0000000000000000000000000000000000000000..42c27a7885f05f61ca49eb2f434000f545c1853e
Binary files /dev/null and b/src/module_vm4ms/web_service/ws_data/vm4ms/map/symbols/legende_Divers/evenement.png differ
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/symbols/legende_LoiLitt/loilitt.png b/src/module_vm4ms/web_service/ws_data/vm4ms/map/symbols/legende_LoiLitt/loilitt.png
new file mode 100755
index 0000000000000000000000000000000000000000..c921f54b72fb18221c17c825959ae0d2db375bdc
Binary files /dev/null and b/src/module_vm4ms/web_service/ws_data/vm4ms/map/symbols/legende_LoiLitt/loilitt.png differ
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/symbols/symbols.sym b/src/module_vm4ms/web_service/ws_data/vm4ms/map/symbols/symbols.sym
new file mode 100755
index 0000000000000000000000000000000000000000..b4aba4d87ff9c506b14b29bfa6911b86aff85257
--- /dev/null
+++ b/src/module_vm4ms/web_service/ws_data/vm4ms/map/symbols/symbols.sym
@@ -0,0 +1,263 @@
+SYMBOLSET
+#1
+SYMBOL 
+	NAME 'tent'
+	TYPE VECTOR
+	FILLED TRUE
+	POINTS
+		0 1
+		.5 0
+		1 1
+		.75 1
+		.5 .5
+		.25 1
+		0 1
+	END
+END 
+
+#2
+SYMBOL
+	NAME 'star'
+	TYPE VECTOR
+	FILLED TRUE
+	POINTS
+		0 .375
+		.35 .375
+		.5 0
+		.65 .375
+		1 .375
+		.75 .625
+		.875 1
+		.5 .75
+		.125 1
+		.25 .625
+	END
+END 
+
+#3
+SYMBOL
+	NAME 'triangle'
+	TYPE VECTOR
+	FILLED TRUE
+	POINTS
+		0 1
+		.5 0
+		1 1
+		0 1
+	END
+END 
+
+#4
+SYMBOL
+	NAME 'square'
+	TYPE VECTOR
+	FILLED TRUE
+	POINTS
+		0 1
+		0 0
+		1 0
+		1 1
+		0 1
+	END
+END 
+
+#5
+SYMBOL
+	NAME 'plus'
+	TYPE VECTOR
+	POINTS
+		.5 0
+		.5 1
+		-99 -99
+		0 .5
+		1 .5
+	END
+END 
+
+#6
+SYMBOL
+	NAME 'cross'
+	TYPE VECTOR
+	POINTS
+		0 0
+		1 1
+		-99 -99
+		0 1
+		1 0
+	END
+END
+
+#7
+SYMBOL
+	NAME 'circle'
+	TYPE ELLIPSE
+	FILLED TRUE
+	POINTS
+		1 1
+	END
+END
+
+# 8
+SYMBOL
+	NAME 'line1'
+	TYPE VECTOR
+	TRANSPARENT 0
+	POINTS
+		0 1
+		1 1
+	END
+END 
+
+# 9
+SYMBOL
+	NAME 'line2'
+	TYPE VECTOR
+	TRANSPARENT 0
+	POINTS
+		1 0
+		1 1
+	END
+END 
+
+# 10
+SYMBOL
+	NAME 'line3'
+	TYPE VECTOR
+	TRANSPARENT 0
+	POINTS
+		0 0
+		1 1
+	END
+END 
+
+# 11
+SYMBOL
+	NAME 'line4'
+	TYPE VECTOR
+	TRANSPARENT 0
+	POINTS
+		0 1
+		1 0
+	END
+END 
+
+# 12
+SYMBOL
+	NAME 'line5'
+	TYPE VECTOR
+	TRANSPARENT 0
+	POINTS
+		1 0
+		0 1
+		0 1
+		1 0
+	END
+END 
+
+# 13
+SYMBOL
+	NAME 'line6'
+	TYPE VECTOR
+	POINTS
+		0 1
+		1 0
+		-99 -99
+		0 0
+		1 1
+	END
+END
+
+#14
+SYMBOL
+	NAME 'line7'
+	TYPE ELLIPSE 
+	FILLED FALSE
+	POINTS
+		1 1
+	END
+END
+
+#15
+SYMBOL 
+	NAME "dashed" 
+	TYPE ELLIPSE 
+	FILLED true 
+	POINTS 
+		1 1 
+	END 
+END
+
+#17
+SYMBOL   
+	NAME "hachure_diagonal"
+	TYPE vector
+	POINTS
+		0 1
+		1 0
+	END
+END
+
+#18
+SYMBOL
+	NAME 'tirete'
+	TYPE ELLIPSE
+	POINTS 1 1 END
+	FILLED true
+END
+
+#19
+SYMBOL
+	NAME 'plein'
+	TYPE ELLIPSE
+	POINTS 1 1 END
+	FILLED true
+END
+
+#27
+SYMBOL
+	NAME "|"
+	TYPE TRUETYPE
+	FONT "Arial"
+	CHARACTER "|"
+	ANTIALIAS TRUE
+END
+
+#28
+SYMBOL
+	NAME "point_line"
+	TYPE ELLIPSE
+	FILLED true
+	POINTS
+		1 1
+	END
+END
+
+#29
+SYMBOL
+	NAME "point_line_large"
+	TYPE ELLIPSE
+	FILLED true
+	POINTS
+		1 1
+	END
+END
+
+#30
+SYMBOL
+	NAME "hachure_inverse"
+	TYPE vector
+	POINTS
+		0 0
+		1 1
+	END   
+END
+
+#31
+SYMBOL
+  NAME 'tooltip'
+  TYPE PIXMAP
+  IMAGE tooltip/tooltip.gif
+  TRANSPARENT 0
+END
+
+END
\ No newline at end of file
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/symbols/tooltip/tooltip.gif b/src/module_vm4ms/web_service/ws_data/vm4ms/map/symbols/tooltip/tooltip.gif
new file mode 100755
index 0000000000000000000000000000000000000000..b5ce0451294d28a18eb11a649ccd88da5ac622e5
Binary files /dev/null and b/src/module_vm4ms/web_service/ws_data/vm4ms/map/symbols/tooltip/tooltip.gif differ
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/symbols/tooltip/tooltip2.gif b/src/module_vm4ms/web_service/ws_data/vm4ms/map/symbols/tooltip/tooltip2.gif
new file mode 100755
index 0000000000000000000000000000000000000000..3c85bceec51e9c7d071dd0853a9dd597330fc487
Binary files /dev/null and b/src/module_vm4ms/web_service/ws_data/vm4ms/map/symbols/tooltip/tooltip2.gif differ
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/template/legend.html b/src/module_vm4ms/web_service/ws_data/vm4ms/map/template/legend.html
new file mode 100755
index 0000000000000000000000000000000000000000..301cb7cc263d402e107b5db7bab12dcc79162f9c
--- /dev/null
+++ b/src/module_vm4ms/web_service/ws_data/vm4ms/map/template/legend.html
@@ -0,0 +1,10 @@
+
+[leg_class_html]
+<div>
+	<span id="legend_[leg_class_index]" class="legendLayerName">&nbsp;[leg_layer_name] </span>
+	<div>
+		&nbsp;&nbsp;<img src="[leg_icon]" width="15" height="15" />
+		<span class="legendClassName"> [leg_class_name]</span>
+	</div>
+</div>
+[/leg_class_html]
\ No newline at end of file
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/template/legend_without_layer_name.html b/src/module_vm4ms/web_service/ws_data/vm4ms/map/template/legend_without_layer_name.html
new file mode 100755
index 0000000000000000000000000000000000000000..996f9198af4956887482c269e83c1b07a0dd871d
--- /dev/null
+++ b/src/module_vm4ms/web_service/ws_data/vm4ms/map/template/legend_without_layer_name.html
@@ -0,0 +1,8 @@
+[leg_class_html]
+<div>
+	<div>
+		&nbsp;&nbsp;<img src="[leg_icon]" width="15" height="15" />
+		<span class="legendClassName"> [leg_class_name]</span>
+	</div>
+</div>
+[/leg_class_html]
\ No newline at end of file
diff --git a/src/module_vm4ms/web_service/ws_data/vm4ms/map/template/template.html b/src/module_vm4ms/web_service/ws_data/vm4ms/map/template/template.html
new file mode 100755
index 0000000000000000000000000000000000000000..a4df667099006033652c5ed2d44c5418e7c7565b
--- /dev/null
+++ b/src/module_vm4ms/web_service/ws_data/vm4ms/map/template/template.html
@@ -0,0 +1,68 @@
+<!-- MapServer Template -->
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <!--<link rel="stylesheet" href="css/lib/bootstrap/css/bootstrap.min.css?version=2">-->
+    <!--<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">-->
+    <style>
+        .legendLayerName {
+            word-break: break-all;
+        }
+        .legendClassName {
+            word-break: break-all;
+        }
+    </style>
+</head>
+<body>
+    <form method="get" action="[ms_cgi_url]" name="mapForm">
+        <p>
+            <input type="hidden" name="ms_cgi_url" value="[ms_cgi_url]">
+            <input type="hidden" name="map" value="[map]">
+            <input type="hidden" name="imgext" value="[mapext]">
+            <input type="hidden" name="LAYERS" value="[LAYERS]">
+            <input type="hidden" name="MAPSIZE" value="[MAPSIZE]">
+        </p>
+        <div class="container-fluid">
+            <div class="col-md-12" style="padding: 0">
+                <div class="container-fluid">
+                    <div class="row">
+                        <div class="col-xs-3" style="padding: 0 21px 0 0; height: [mapheight]px; overflow-x: hidden; overflow-y: auto">
+                            <!--Légende-->
+                            [legend]
+                        </div>
+                        <div class="col-xs-9" style="padding: 0">
+                            <!--Carte-->
+                            <input class="MapLayer" type="image" name="img" src="[img]" width="[mapwidth]" height="[mapheight]" border="0" alt="">
+                        </div>
+                    </div>
+                </div>
+                <div class="container-fluid" style="padding: 0">
+                    <div class="bg-info" style="width:100%">
+                        <div class="container-fluid" style="padding: 7px;margin-left: 5px;margin-right: -5px;margin-top: 15px;">
+                            <div class="col-xs-6">
+                                <!--Échelle-->
+                                <label style="margin-top: 5px;">Échelle: </label>
+                                1/<span id="scaledenom">[scaledenom]</span>
+                            </div>
+                            <div class="col-xs-6 text-right">
+                                <div class="row">
+                                    <div class="col-xs-6">
+                                        <label style="margin-top: 5px;">Actions: </label>
+                                    </div>
+                                    <div class="col-xs-6">
+                                        <select class="form-control input-sm" name="zoom">
+                                            <option value="1"[zoom_1_select]>pan</option>
+                                            <option value="2" [zoom_2_select]>zoom * 2</option>
+                                            <option value="3"[zoom_3_select]>zoom * 3</option>
+                                            <option value="-2"[zoom_-2_select]>zoom * -2</option>
+                                            <option value="-3"[zoom_-3_select]>zoom * -3</option>
+                                        </select>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </form>
+</body>
\ No newline at end of file
diff --git a/src/module_vm4ms/web_service/ws_data/vmap/business_object/veremes_commune_point/forms/custom.json b/src/module_vm4ms/web_service/ws_data/vmap/business_object/veremes_commune_point/forms/custom.json
new file mode 100755
index 0000000000000000000000000000000000000000..b92501932d7c69ddd540d7b38d255773b04d669f
--- /dev/null
+++ b/src/module_vm4ms/web_service/ws_data/vmap/business_object/veremes_commune_point/forms/custom.json
@@ -0,0 +1,242 @@
+{
+  "display": {
+    "name": "custom-form",
+    "title": "veremes_commune_point",
+    "input_size": "xxs",
+    "nb_cols": 12,
+    "javascript": false,
+    "rows": [
+      {
+        "fields": [
+          {
+            "type": "label",
+            "name": "code",
+            "label": "Code INSEE",
+            "disabled": false,
+            "required": false,
+            "nb_cols": 12,
+            "id": "code_1_1"
+          }
+        ]
+      },
+      {
+        "fields": [
+          {
+            "type": "label",
+            "name": "nom",
+            "label": "Nom de la commune",
+            "disabled": false,
+            "required": false,
+            "nb_cols": 12,
+            "id": "nom_2_1"
+          }
+        ]
+      },
+      {
+        "fields": [
+          {
+            "type": "label",
+            "pattern": "[-+]?(\\d*[.])?\\d+",
+            "name": "pop90",
+            "label": "Population en 1990",
+            "disabled": false,
+            "required": false,
+            "nb_cols": 12,
+            "id": "pop90_3_1"
+          }
+        ]
+      }
+    ],
+    "tabs": {
+      "position": "top",
+      "list": [
+        {
+          "label": "Tab 0",
+          "elements": [
+            "code",
+            "nom",
+            "pop90"
+          ]
+        }
+      ]
+    }
+  },
+  "search": {
+    "name": "custom-form",
+    "title": "veremes_commune_point",
+    "input_size": "xxs",
+    "nb_cols": 12,
+    "javascript": false,
+    "rows": [
+      {
+        "fields": [
+          {
+            "type": "text",
+            "name": "nom",
+            "label": "Nom de la commune",
+            "required": false,
+            "pattern": "",
+            "nb_cols": 4,
+            "id": "Element_0_2_1"
+          },
+          {
+            "type": "text",
+            "name": "code",
+            "label": "Code INSEE",
+            "required": false,
+            "pattern": "",
+            "nb_cols": 4,
+            "id": "Element_0_1_1"
+          },
+          {
+            "type": "text",
+            "name": "pop90",
+            "label": "Population en 1990",
+            "required": false,
+            "pattern": "",
+            "nb_cols": 4,
+            "id": "Element_0_3_1"
+          }
+        ]
+      }
+    ],
+    "tabs": {
+      "position": "top",
+      "list": [
+        {
+          "label": "Tab 0",
+          "elements": [
+            "code",
+            "nom",
+            "pop90"
+          ]
+        }
+      ]
+    }
+  },
+  "insert": {
+    "name": "custom-form",
+    "title": "veremes_commune_point",
+    "input_size": "xxs",
+    "nb_cols": 12,
+    "javascript": false,
+    "rows": [
+      {
+        "fields": [
+          {
+            "type": "text",
+            "name": "code",
+            "label": "Code INSEE",
+            "disabled": false,
+            "required": false,
+            "nb_cols": 12,
+            "id": "code_1_1"
+          }
+        ]
+      },
+      {
+        "fields": [
+          {
+            "type": "text",
+            "name": "nom",
+            "label": "Nom de la commune",
+            "disabled": false,
+            "required": false,
+            "nb_cols": 12,
+            "id": "nom_2_1"
+          }
+        ]
+      },
+      {
+        "fields": [
+          {
+            "type": "text",
+            "pattern": "[-+]?(\\d*[.])?\\d+",
+            "name": "pop90",
+            "label": "Population en 1990",
+            "disabled": false,
+            "required": false,
+            "nb_cols": 12,
+            "id": "pop90_3_1"
+          }
+        ]
+      }
+    ],
+    "tabs": {
+      "position": "top",
+      "list": [
+        {
+          "label": "Tab 0",
+          "elements": [
+            "code",
+            "nom",
+            "pop90"
+          ]
+        }
+      ]
+    }
+  },
+  "update": {
+    "name": "custom-form",
+    "title": "veremes_commune_point",
+    "input_size": "xxs",
+    "nb_cols": 12,
+    "javascript": false,
+    "rows": [
+      {
+        "fields": [
+          {
+            "type": "label",
+            "name": "code",
+            "label": "Code INSEE",
+            "disabled": false,
+            "required": false,
+            "nb_cols": 12,
+            "id": "code_1_1"
+          }
+        ]
+      },
+      {
+        "fields": [
+          {
+            "type": "text",
+            "name": "nom",
+            "label": "Nom de la commune",
+            "disabled": false,
+            "required": false,
+            "nb_cols": 12,
+            "id": "nom_2_1"
+          }
+        ]
+      },
+      {
+        "fields": [
+          {
+            "type": "text",
+            "pattern": "[-+]?(\\d*[.])?\\d+",
+            "name": "pop90",
+            "label": "Population en 1990",
+            "disabled": false,
+            "required": false,
+            "nb_cols": 12,
+            "id": "pop90_3_1"
+          }
+        ]
+      }
+    ],
+    "tabs": {
+      "position": "top",
+      "list": [
+        {
+          "label": "Tab 0",
+          "elements": [
+            "code",
+            "nom",
+            "pop90"
+          ]
+        }
+      ]
+    }
+  },
+  "datasources": {}
+}
\ No newline at end of file
diff --git a/src/module_vm4ms/web_service/ws_data/vmap/business_object/veremes_commune_point/forms/default.json b/src/module_vm4ms/web_service/ws_data/vmap/business_object/veremes_commune_point/forms/default.json
new file mode 100755
index 0000000000000000000000000000000000000000..a5a6c90e0c64fac6400c31b57c7c3ca58aff1f59
--- /dev/null
+++ b/src/module_vm4ms/web_service/ws_data/vmap/business_object/veremes_commune_point/forms/default.json
@@ -0,0 +1 @@
+{"display":{"name":"custom-form","title":"veremes_commune_point","input_size":"xxs","nb_cols":12,"javascript":false,"rows":[{"fields":[{"type":"label","name":"code","label":"code","disabled":false,"required":false,"nb_cols":12}]},{"fields":[{"type":"label","name":"nom","label":"nom","disabled":false,"required":false,"nb_cols":12}]},{"fields":[{"type":"label","pattern":"[-+]?(\\d*[.])?\\d+","name":"pop90","label":"pop90","disabled":false,"required":false,"nb_cols":12}]}]},"search":{"name":"custom-form","title":"veremes_commune_point","input_size":"xxs","nb_cols":12,"javascript":false,"rows":[]},"insert":{"name":"custom-form","title":"veremes_commune_point","input_size":"xxs","nb_cols":12,"javascript":false,"rows":[{"fields":[{"type":"text","name":"code","label":"code","disabled":false,"required":false,"nb_cols":12}]},{"fields":[{"type":"text","name":"nom","label":"nom","disabled":false,"required":false,"nb_cols":12}]},{"fields":[{"type":"text","pattern":"[-+]?(\\d*[.])?\\d+","name":"pop90","label":"pop90","disabled":false,"required":false,"nb_cols":12}]}]},"update":{"name":"custom-form","title":"veremes_commune_point","input_size":"xxs","nb_cols":12,"javascript":false,"rows":[{"fields":[{"type":"text","name":"code","label":"code","disabled":false,"required":false,"nb_cols":12}]},{"fields":[{"type":"text","name":"nom","label":"nom","disabled":false,"required":false,"nb_cols":12}]},{"fields":[{"type":"text","pattern":"[-+]?(\\d*[.])?\\d+","name":"pop90","label":"pop90","disabled":false,"required":false,"nb_cols":12}]}]}}
\ No newline at end of file
diff --git a/src/module_vm4ms/web_service/ws_data/vmap/business_object/veremes_commune_point/forms/published.json b/src/module_vm4ms/web_service/ws_data/vmap/business_object/veremes_commune_point/forms/published.json
new file mode 100755
index 0000000000000000000000000000000000000000..b92501932d7c69ddd540d7b38d255773b04d669f
--- /dev/null
+++ b/src/module_vm4ms/web_service/ws_data/vmap/business_object/veremes_commune_point/forms/published.json
@@ -0,0 +1,242 @@
+{
+  "display": {
+    "name": "custom-form",
+    "title": "veremes_commune_point",
+    "input_size": "xxs",
+    "nb_cols": 12,
+    "javascript": false,
+    "rows": [
+      {
+        "fields": [
+          {
+            "type": "label",
+            "name": "code",
+            "label": "Code INSEE",
+            "disabled": false,
+            "required": false,
+            "nb_cols": 12,
+            "id": "code_1_1"
+          }
+        ]
+      },
+      {
+        "fields": [
+          {
+            "type": "label",
+            "name": "nom",
+            "label": "Nom de la commune",
+            "disabled": false,
+            "required": false,
+            "nb_cols": 12,
+            "id": "nom_2_1"
+          }
+        ]
+      },
+      {
+        "fields": [
+          {
+            "type": "label",
+            "pattern": "[-+]?(\\d*[.])?\\d+",
+            "name": "pop90",
+            "label": "Population en 1990",
+            "disabled": false,
+            "required": false,
+            "nb_cols": 12,
+            "id": "pop90_3_1"
+          }
+        ]
+      }
+    ],
+    "tabs": {
+      "position": "top",
+      "list": [
+        {
+          "label": "Tab 0",
+          "elements": [
+            "code",
+            "nom",
+            "pop90"
+          ]
+        }
+      ]
+    }
+  },
+  "search": {
+    "name": "custom-form",
+    "title": "veremes_commune_point",
+    "input_size": "xxs",
+    "nb_cols": 12,
+    "javascript": false,
+    "rows": [
+      {
+        "fields": [
+          {
+            "type": "text",
+            "name": "nom",
+            "label": "Nom de la commune",
+            "required": false,
+            "pattern": "",
+            "nb_cols": 4,
+            "id": "Element_0_2_1"
+          },
+          {
+            "type": "text",
+            "name": "code",
+            "label": "Code INSEE",
+            "required": false,
+            "pattern": "",
+            "nb_cols": 4,
+            "id": "Element_0_1_1"
+          },
+          {
+            "type": "text",
+            "name": "pop90",
+            "label": "Population en 1990",
+            "required": false,
+            "pattern": "",
+            "nb_cols": 4,
+            "id": "Element_0_3_1"
+          }
+        ]
+      }
+    ],
+    "tabs": {
+      "position": "top",
+      "list": [
+        {
+          "label": "Tab 0",
+          "elements": [
+            "code",
+            "nom",
+            "pop90"
+          ]
+        }
+      ]
+    }
+  },
+  "insert": {
+    "name": "custom-form",
+    "title": "veremes_commune_point",
+    "input_size": "xxs",
+    "nb_cols": 12,
+    "javascript": false,
+    "rows": [
+      {
+        "fields": [
+          {
+            "type": "text",
+            "name": "code",
+            "label": "Code INSEE",
+            "disabled": false,
+            "required": false,
+            "nb_cols": 12,
+            "id": "code_1_1"
+          }
+        ]
+      },
+      {
+        "fields": [
+          {
+            "type": "text",
+            "name": "nom",
+            "label": "Nom de la commune",
+            "disabled": false,
+            "required": false,
+            "nb_cols": 12,
+            "id": "nom_2_1"
+          }
+        ]
+      },
+      {
+        "fields": [
+          {
+            "type": "text",
+            "pattern": "[-+]?(\\d*[.])?\\d+",
+            "name": "pop90",
+            "label": "Population en 1990",
+            "disabled": false,
+            "required": false,
+            "nb_cols": 12,
+            "id": "pop90_3_1"
+          }
+        ]
+      }
+    ],
+    "tabs": {
+      "position": "top",
+      "list": [
+        {
+          "label": "Tab 0",
+          "elements": [
+            "code",
+            "nom",
+            "pop90"
+          ]
+        }
+      ]
+    }
+  },
+  "update": {
+    "name": "custom-form",
+    "title": "veremes_commune_point",
+    "input_size": "xxs",
+    "nb_cols": 12,
+    "javascript": false,
+    "rows": [
+      {
+        "fields": [
+          {
+            "type": "label",
+            "name": "code",
+            "label": "Code INSEE",
+            "disabled": false,
+            "required": false,
+            "nb_cols": 12,
+            "id": "code_1_1"
+          }
+        ]
+      },
+      {
+        "fields": [
+          {
+            "type": "text",
+            "name": "nom",
+            "label": "Nom de la commune",
+            "disabled": false,
+            "required": false,
+            "nb_cols": 12,
+            "id": "nom_2_1"
+          }
+        ]
+      },
+      {
+        "fields": [
+          {
+            "type": "text",
+            "pattern": "[-+]?(\\d*[.])?\\d+",
+            "name": "pop90",
+            "label": "Population en 1990",
+            "disabled": false,
+            "required": false,
+            "nb_cols": 12,
+            "id": "pop90_3_1"
+          }
+        ]
+      }
+    ],
+    "tabs": {
+      "position": "top",
+      "list": [
+        {
+          "label": "Tab 0",
+          "elements": [
+            "code",
+            "nom",
+            "pop90"
+          ]
+        }
+      ]
+    }
+  },
+  "datasources": {}
+}
\ No newline at end of file
diff --git a/src/module_vm4ms/web_service/ws_data/vmap/layer/-1/forms/custom.json b/src/module_vm4ms/web_service/ws_data/vmap/layer/-1/forms/custom.json
new file mode 100755
index 0000000000000000000000000000000000000000..85d115cf590bc2bef2dd12e6bc11e548b99b3e37
--- /dev/null
+++ b/src/module_vm4ms/web_service/ws_data/vmap/layer/-1/forms/custom.json
@@ -0,0 +1 @@
+{"datasources":{},"search":{"input_size":"xxs","javascript":false,"name":"custom-form","nb_cols":12,"rows":[{"fields":[{"type":"integer","name":"pop90_sup","label":"Population supérieure à","nb_cols":12,"id":"Element_0_1_1"}]},{"fields":[{"type":"integer","name":"pop90_inf","label":"Population inférieure à","nb_cols":12,"id":"Element_0_2_1"}]}],"title":"","tabs":{"position":"top","list":[{"label":"Tab 0","elements":["pop90_sup","pop90_inf"]}]}}}
\ No newline at end of file
diff --git a/src/module_vm4ms/web_service/ws_data/vmap/layer/-1/forms/published.json b/src/module_vm4ms/web_service/ws_data/vmap/layer/-1/forms/published.json
new file mode 100755
index 0000000000000000000000000000000000000000..85d115cf590bc2bef2dd12e6bc11e548b99b3e37
--- /dev/null
+++ b/src/module_vm4ms/web_service/ws_data/vmap/layer/-1/forms/published.json
@@ -0,0 +1 @@
+{"datasources":{},"search":{"input_size":"xxs","javascript":false,"name":"custom-form","nb_cols":12,"rows":[{"fields":[{"type":"integer","name":"pop90_sup","label":"Population supérieure à","nb_cols":12,"id":"Element_0_1_1"}]},{"fields":[{"type":"integer","name":"pop90_inf","label":"Population inférieure à","nb_cols":12,"id":"Element_0_2_1"}]}],"title":"","tabs":{"position":"top","list":[{"label":"Tab 0","elements":["pop90_sup","pop90_inf"]}]}}}
\ No newline at end of file
diff --git a/src/module_vmap/README.md b/src/module_vmap/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..2bf9fbb76d8a139e6cdd19c8e39cf88f6f2d0340
--- /dev/null
+++ b/src/module_vmap/README.md
@@ -0,0 +1 @@
+Module vMap for Vitis
\ No newline at end of file
diff --git a/vmap/client/modules/vmap/CHANGE_LOG.txt b/src/module_vmap/module/CHANGE_LOG.txt
similarity index 100%
rename from vmap/client/modules/vmap/CHANGE_LOG.txt
rename to src/module_vmap/module/CHANGE_LOG.txt
diff --git a/vmap/client/modules/vmap/_install/dependency.xml b/src/module_vmap/module/_install/dependency.xml
similarity index 100%
rename from vmap/client/modules/vmap/_install/dependency.xml
rename to src/module_vmap/module/_install/dependency.xml
diff --git a/vmap/client/modules/vmap/css/fonts.css b/src/module_vmap/module/css/fonts.css
similarity index 100%
rename from vmap/client/modules/vmap/css/fonts.css
rename to src/module_vmap/module/css/fonts.css
diff --git a/vmap/client/modules/vmap/css/fonts/icomoon.eot b/src/module_vmap/module/css/fonts/icomoon.eot
similarity index 100%
rename from vmap/client/modules/vmap/css/fonts/icomoon.eot
rename to src/module_vmap/module/css/fonts/icomoon.eot
diff --git a/vmap/client/modules/vmap/css/fonts/icomoon.svg b/src/module_vmap/module/css/fonts/icomoon.svg
similarity index 100%
rename from vmap/client/modules/vmap/css/fonts/icomoon.svg
rename to src/module_vmap/module/css/fonts/icomoon.svg
diff --git a/vmap/client/modules/vmap/css/fonts/icomoon.ttf b/src/module_vmap/module/css/fonts/icomoon.ttf
similarity index 100%
rename from vmap/client/modules/vmap/css/fonts/icomoon.ttf
rename to src/module_vmap/module/css/fonts/icomoon.ttf
diff --git a/vmap/client/modules/vmap/css/fonts/icomoon.woff b/src/module_vmap/module/css/fonts/icomoon.woff
similarity index 100%
rename from vmap/client/modules/vmap/css/fonts/icomoon.woff
rename to src/module_vmap/module/css/fonts/icomoon.woff
diff --git a/vmap/client/css/lib/bootstrap-checkbox/build.css b/src/module_vmap/module/css/lib/bootstrap-checkbox/build.css
similarity index 100%
rename from vmap/client/css/lib/bootstrap-checkbox/build.css
rename to src/module_vmap/module/css/lib/bootstrap-checkbox/build.css
diff --git a/vmap/client/modules/vmap/css/lib/bootstrap-checkbox/font-awesome.css b/src/module_vmap/module/css/lib/bootstrap-checkbox/font-awesome.css
similarity index 100%
rename from vmap/client/modules/vmap/css/lib/bootstrap-checkbox/font-awesome.css
rename to src/module_vmap/module/css/lib/bootstrap-checkbox/font-awesome.css
diff --git a/vmap/client/modules/vmap/css/lib/bootstrap-table/bootstrap-table.min.css b/src/module_vmap/module/css/lib/bootstrap-table/bootstrap-table.min.css
similarity index 100%
rename from vmap/client/modules/vmap/css/lib/bootstrap-table/bootstrap-table.min.css
rename to src/module_vmap/module/css/lib/bootstrap-table/bootstrap-table.min.css
diff --git a/vmap/client/modules/vmap/css/lib/bootstrap-toggle/bootstrap-toggle.css b/src/module_vmap/module/css/lib/bootstrap-toggle/bootstrap-toggle.css
similarity index 100%
rename from vmap/client/modules/vmap/css/lib/bootstrap-toggle/bootstrap-toggle.css
rename to src/module_vmap/module/css/lib/bootstrap-toggle/bootstrap-toggle.css
diff --git a/vmap/client/modules/vmap/css/lib/bootstrap-toggle/bootstrap-toggle.min.css b/src/module_vmap/module/css/lib/bootstrap-toggle/bootstrap-toggle.min.css
similarity index 100%
rename from vmap/client/modules/vmap/css/lib/bootstrap-toggle/bootstrap-toggle.min.css
rename to src/module_vmap/module/css/lib/bootstrap-toggle/bootstrap-toggle.min.css
diff --git a/vmap/client/css/lib/bootstrap/css/bootstrap-theme.css b/src/module_vmap/module/css/lib/bootstrap/css/bootstrap-theme.css
similarity index 100%
rename from vmap/client/css/lib/bootstrap/css/bootstrap-theme.css
rename to src/module_vmap/module/css/lib/bootstrap/css/bootstrap-theme.css
diff --git a/vmap/client/css/lib/bootstrap/css/bootstrap-theme.css.map b/src/module_vmap/module/css/lib/bootstrap/css/bootstrap-theme.css.map
similarity index 100%
rename from vmap/client/css/lib/bootstrap/css/bootstrap-theme.css.map
rename to src/module_vmap/module/css/lib/bootstrap/css/bootstrap-theme.css.map
diff --git a/vmap/client/css/lib/bootstrap/css/bootstrap-theme.min.css b/src/module_vmap/module/css/lib/bootstrap/css/bootstrap-theme.min.css
similarity index 100%
rename from vmap/client/css/lib/bootstrap/css/bootstrap-theme.min.css
rename to src/module_vmap/module/css/lib/bootstrap/css/bootstrap-theme.min.css
diff --git a/vmap/client/modules/vmap/css/lib/bootstrap/css/bootstrap.css b/src/module_vmap/module/css/lib/bootstrap/css/bootstrap.css
similarity index 100%
rename from vmap/client/modules/vmap/css/lib/bootstrap/css/bootstrap.css
rename to src/module_vmap/module/css/lib/bootstrap/css/bootstrap.css
diff --git a/vmap/client/css/lib/bootstrap/css/bootstrap.css.map b/src/module_vmap/module/css/lib/bootstrap/css/bootstrap.css.map
similarity index 100%
rename from vmap/client/css/lib/bootstrap/css/bootstrap.css.map
rename to src/module_vmap/module/css/lib/bootstrap/css/bootstrap.css.map
diff --git a/vmap/client/css/lib/bootstrap/css/bootstrap.min.css b/src/module_vmap/module/css/lib/bootstrap/css/bootstrap.min.css
similarity index 100%
rename from vmap/client/css/lib/bootstrap/css/bootstrap.min.css
rename to src/module_vmap/module/css/lib/bootstrap/css/bootstrap.min.css
diff --git a/vmap/client/css/lib/bootstrap/fonts/glyphicons-halflings-regular.eot b/src/module_vmap/module/css/lib/bootstrap/fonts/glyphicons-halflings-regular.eot
similarity index 100%
rename from vmap/client/css/lib/bootstrap/fonts/glyphicons-halflings-regular.eot
rename to src/module_vmap/module/css/lib/bootstrap/fonts/glyphicons-halflings-regular.eot
diff --git a/vmap/client/css/lib/bootstrap/fonts/glyphicons-halflings-regular.svg b/src/module_vmap/module/css/lib/bootstrap/fonts/glyphicons-halflings-regular.svg
similarity index 100%
rename from vmap/client/css/lib/bootstrap/fonts/glyphicons-halflings-regular.svg
rename to src/module_vmap/module/css/lib/bootstrap/fonts/glyphicons-halflings-regular.svg
diff --git a/vmap/client/css/lib/bootstrap/fonts/glyphicons-halflings-regular.ttf b/src/module_vmap/module/css/lib/bootstrap/fonts/glyphicons-halflings-regular.ttf
similarity index 100%
rename from vmap/client/css/lib/bootstrap/fonts/glyphicons-halflings-regular.ttf
rename to src/module_vmap/module/css/lib/bootstrap/fonts/glyphicons-halflings-regular.ttf
diff --git a/vmap/client/css/lib/bootstrap/fonts/glyphicons-halflings-regular.woff b/src/module_vmap/module/css/lib/bootstrap/fonts/glyphicons-halflings-regular.woff
similarity index 100%
rename from vmap/client/css/lib/bootstrap/fonts/glyphicons-halflings-regular.woff
rename to src/module_vmap/module/css/lib/bootstrap/fonts/glyphicons-halflings-regular.woff
diff --git a/vmap/client/css/lib/bootstrap/fonts/glyphicons-halflings-regular.woff2 b/src/module_vmap/module/css/lib/bootstrap/fonts/glyphicons-halflings-regular.woff2
similarity index 100%
rename from vmap/client/css/lib/bootstrap/fonts/glyphicons-halflings-regular.woff2
rename to src/module_vmap/module/css/lib/bootstrap/fonts/glyphicons-halflings-regular.woff2
diff --git a/vmap/client/modules/vmap/css/lib/colorpicker/css/bootstrap-colorpicker.css b/src/module_vmap/module/css/lib/colorpicker/css/bootstrap-colorpicker.css
similarity index 100%
rename from vmap/client/modules/vmap/css/lib/colorpicker/css/bootstrap-colorpicker.css
rename to src/module_vmap/module/css/lib/colorpicker/css/bootstrap-colorpicker.css
diff --git a/vmap/client/css/lib/jquery/plugins/bootstrap-colorpicker/css/bootstrap-colorpicker.min.css b/src/module_vmap/module/css/lib/colorpicker/css/bootstrap-colorpicker.min.css
similarity index 100%
rename from vmap/client/css/lib/jquery/plugins/bootstrap-colorpicker/css/bootstrap-colorpicker.min.css
rename to src/module_vmap/module/css/lib/colorpicker/css/bootstrap-colorpicker.min.css
diff --git a/vmap/client/css/lib/jquery/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha-horizontal.png b/src/module_vmap/module/css/lib/colorpicker/img/bootstrap-colorpicker/alpha-horizontal.png
similarity index 100%
rename from vmap/client/css/lib/jquery/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha-horizontal.png
rename to src/module_vmap/module/css/lib/colorpicker/img/bootstrap-colorpicker/alpha-horizontal.png
diff --git a/vmap/client/css/lib/jquery/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha.png b/src/module_vmap/module/css/lib/colorpicker/img/bootstrap-colorpicker/alpha.png
similarity index 100%
rename from vmap/client/css/lib/jquery/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha.png
rename to src/module_vmap/module/css/lib/colorpicker/img/bootstrap-colorpicker/alpha.png
diff --git a/vmap/client/css/lib/jquery/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/hue-horizontal.png b/src/module_vmap/module/css/lib/colorpicker/img/bootstrap-colorpicker/hue-horizontal.png
similarity index 100%
rename from vmap/client/css/lib/jquery/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/hue-horizontal.png
rename to src/module_vmap/module/css/lib/colorpicker/img/bootstrap-colorpicker/hue-horizontal.png
diff --git a/vmap/client/css/lib/jquery/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/hue.png b/src/module_vmap/module/css/lib/colorpicker/img/bootstrap-colorpicker/hue.png
similarity index 100%
rename from vmap/client/css/lib/jquery/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/hue.png
rename to src/module_vmap/module/css/lib/colorpicker/img/bootstrap-colorpicker/hue.png
diff --git a/vmap/client/css/lib/jquery/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/saturation.png b/src/module_vmap/module/css/lib/colorpicker/img/bootstrap-colorpicker/saturation.png
similarity index 100%
rename from vmap/client/css/lib/jquery/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/saturation.png
rename to src/module_vmap/module/css/lib/colorpicker/img/bootstrap-colorpicker/saturation.png
diff --git a/vmap/client/css/lib/fonts/FontAwesome.otf b/src/module_vmap/module/css/lib/fonts/FontAwesome.otf
similarity index 100%
rename from vmap/client/css/lib/fonts/FontAwesome.otf
rename to src/module_vmap/module/css/lib/fonts/FontAwesome.otf
diff --git a/vmap/client/css/lib/fonts/fontawesome-webfont.eot b/src/module_vmap/module/css/lib/fonts/fontawesome-webfont.eot
similarity index 100%
rename from vmap/client/css/lib/fonts/fontawesome-webfont.eot
rename to src/module_vmap/module/css/lib/fonts/fontawesome-webfont.eot
diff --git a/vmap/client/css/lib/fonts/fontawesome-webfont.svg b/src/module_vmap/module/css/lib/fonts/fontawesome-webfont.svg
similarity index 100%
rename from vmap/client/css/lib/fonts/fontawesome-webfont.svg
rename to src/module_vmap/module/css/lib/fonts/fontawesome-webfont.svg
diff --git a/vmap/client/css/lib/fonts/fontawesome-webfont.ttf b/src/module_vmap/module/css/lib/fonts/fontawesome-webfont.ttf
similarity index 100%
rename from vmap/client/css/lib/fonts/fontawesome-webfont.ttf
rename to src/module_vmap/module/css/lib/fonts/fontawesome-webfont.ttf
diff --git a/vmap/client/css/lib/fonts/fontawesome-webfont.woff b/src/module_vmap/module/css/lib/fonts/fontawesome-webfont.woff
similarity index 100%
rename from vmap/client/css/lib/fonts/fontawesome-webfont.woff
rename to src/module_vmap/module/css/lib/fonts/fontawesome-webfont.woff
diff --git a/vmap/client/css/lib/fonts/fontawesome-webfont.woff2 b/src/module_vmap/module/css/lib/fonts/fontawesome-webfont.woff2
similarity index 100%
rename from vmap/client/css/lib/fonts/fontawesome-webfont.woff2
rename to src/module_vmap/module/css/lib/fonts/fontawesome-webfont.woff2
diff --git a/vmap/client/css/lib/fonts/glyphicons-halflings-regular.eot b/src/module_vmap/module/css/lib/fonts/glyphicons-halflings-regular.eot
similarity index 100%
rename from vmap/client/css/lib/fonts/glyphicons-halflings-regular.eot
rename to src/module_vmap/module/css/lib/fonts/glyphicons-halflings-regular.eot
diff --git a/vmap/client/css/lib/fonts/glyphicons-halflings-regular.svg b/src/module_vmap/module/css/lib/fonts/glyphicons-halflings-regular.svg
similarity index 100%
rename from vmap/client/css/lib/fonts/glyphicons-halflings-regular.svg
rename to src/module_vmap/module/css/lib/fonts/glyphicons-halflings-regular.svg
diff --git a/vmap/client/css/lib/fonts/glyphicons-halflings-regular.ttf b/src/module_vmap/module/css/lib/fonts/glyphicons-halflings-regular.ttf
similarity index 100%
rename from vmap/client/css/lib/fonts/glyphicons-halflings-regular.ttf
rename to src/module_vmap/module/css/lib/fonts/glyphicons-halflings-regular.ttf
diff --git a/vmap/client/css/lib/fonts/glyphicons-halflings-regular.woff b/src/module_vmap/module/css/lib/fonts/glyphicons-halflings-regular.woff
similarity index 100%
rename from vmap/client/css/lib/fonts/glyphicons-halflings-regular.woff
rename to src/module_vmap/module/css/lib/fonts/glyphicons-halflings-regular.woff
diff --git a/vmap/client/css/lib/fonts/glyphicons-halflings-regular.woff2 b/src/module_vmap/module/css/lib/fonts/glyphicons-halflings-regular.woff2
similarity index 100%
rename from vmap/client/css/lib/fonts/glyphicons-halflings-regular.woff2
rename to src/module_vmap/module/css/lib/fonts/glyphicons-halflings-regular.woff2
diff --git a/vmap/client/modules/vmap/css/lib/jquery-sortable/jquery-sortable.css b/src/module_vmap/module/css/lib/jquery-sortable/jquery-sortable.css
similarity index 100%
rename from vmap/client/modules/vmap/css/lib/jquery-sortable/jquery-sortable.css
rename to src/module_vmap/module/css/lib/jquery-sortable/jquery-sortable.css
diff --git a/vmap/client/modules/vmap/css/mobile.less b/src/module_vmap/module/css/mobile.less
similarity index 100%
rename from vmap/client/modules/vmap/css/mobile.less
rename to src/module_vmap/module/css/mobile.less
diff --git a/vmap/client/modules/vmap/css/ol.css b/src/module_vmap/module/css/ol.css
similarity index 100%
rename from vmap/client/modules/vmap/css/ol.css
rename to src/module_vmap/module/css/ol.css
diff --git a/vmap/client/modules/vmap/css/variables.less b/src/module_vmap/module/css/variables.less
similarity index 100%
rename from vmap/client/modules/vmap/css/variables.less
rename to src/module_vmap/module/css/variables.less
diff --git a/vmap/client/modules/vmap/css/vmap.less b/src/module_vmap/module/css/vmap.less
similarity index 100%
rename from vmap/client/modules/vmap/css/vmap.less
rename to src/module_vmap/module/css/vmap.less
diff --git a/vmap/client/modules/vmap/forms/configuration/configuration_vitis_configuration_vmapConfig.json b/src/module_vmap/module/forms/configuration/configuration_vitis_configuration_vmapConfig.json
similarity index 100%
rename from vmap/client/modules/vmap/forms/configuration/configuration_vitis_configuration_vmapConfig.json
rename to src/module_vmap/module/forms/configuration/configuration_vitis_configuration_vmapConfig.json
diff --git a/vmap/client/modules/vmap/forms/users/users_vitis_group_vmap_group.json b/src/module_vmap/module/forms/users/users_vitis_group_vmap_group.json
similarity index 100%
rename from vmap/client/modules/vmap/forms/users/users_vitis_group_vmap_group.json
rename to src/module_vmap/module/forms/users/users_vitis_group_vmap_group.json
diff --git a/vmap/client/modules/vmap/forms/users/users_vitis_users_vmap_user.json b/src/module_vmap/module/forms/users/users_vitis_users_vmap_user.json
similarity index 100%
rename from vmap/client/modules/vmap/forms/users/users_vitis_users_vmap_user.json
rename to src/module_vmap/module/forms/users/users_vitis_users_vmap_user.json
diff --git a/vmap/client/modules/vmap/forms/vmap_admin_map/vmap_admin_map_vmap_admin_map.json b/src/module_vmap/module/forms/vmap_admin_map/vmap_admin_map_vmap_admin_map.json
similarity index 100%
rename from vmap/client/modules/vmap/forms/vmap_admin_map/vmap_admin_map_vmap_admin_map.json
rename to src/module_vmap/module/forms/vmap_admin_map/vmap_admin_map_vmap_admin_map.json
diff --git a/vmap/client/modules/vmap/forms/vmap_admin_map/vmap_admin_map_vmap_admin_map_available_layers.json b/src/module_vmap/module/forms/vmap_admin_map/vmap_admin_map_vmap_admin_map_available_layers.json
similarity index 100%
rename from vmap/client/modules/vmap/forms/vmap_admin_map/vmap_admin_map_vmap_admin_map_available_layers.json
rename to src/module_vmap/module/forms/vmap_admin_map/vmap_admin_map_vmap_admin_map_available_layers.json
diff --git a/vmap/client/modules/vmap/forms/vmap_admin_map/vmap_admin_map_vmap_admin_map_layers.json b/src/module_vmap/module/forms/vmap_admin_map/vmap_admin_map_vmap_admin_map_layers.json
similarity index 100%
rename from vmap/client/modules/vmap/forms/vmap_admin_map/vmap_admin_map_vmap_admin_map_layers.json
rename to src/module_vmap/module/forms/vmap_admin_map/vmap_admin_map_vmap_admin_map_layers.json
diff --git a/vmap/client/modules/vmap/forms/vmap_admin_map/vmap_admin_map_vmap_layer_theme.json b/src/module_vmap/module/forms/vmap_admin_map/vmap_admin_map_vmap_layer_theme.json
similarity index 100%
rename from vmap/client/modules/vmap/forms/vmap_admin_map/vmap_admin_map_vmap_layer_theme.json
rename to src/module_vmap/module/forms/vmap_admin_map/vmap_admin_map_vmap_layer_theme.json
diff --git a/vmap/client/modules/vmap/forms/vmap_admin_map/vmap_admin_map_vmap_layers.json b/src/module_vmap/module/forms/vmap_admin_map/vmap_admin_map_vmap_layers.json
similarity index 100%
rename from vmap/client/modules/vmap/forms/vmap_admin_map/vmap_admin_map_vmap_layers.json
rename to src/module_vmap/module/forms/vmap_admin_map/vmap_admin_map_vmap_layers.json
diff --git a/vmap/client/modules/vmap/forms/vmap_admin_map/vmap_admin_map_vmap_layers_openlayers_test.json b/src/module_vmap/module/forms/vmap_admin_map/vmap_admin_map_vmap_layers_openlayers_test.json
similarity index 100%
rename from vmap/client/modules/vmap/forms/vmap_admin_map/vmap_admin_map_vmap_layers_openlayers_test.json
rename to src/module_vmap/module/forms/vmap_admin_map/vmap_admin_map_vmap_layers_openlayers_test.json
diff --git a/vmap/client/modules/vmap/forms/vmap_admin_map/vmap_admin_map_vmap_map_theme.json b/src/module_vmap/module/forms/vmap_admin_map/vmap_admin_map_vmap_map_theme.json
similarity index 100%
rename from vmap/client/modules/vmap/forms/vmap_admin_map/vmap_admin_map_vmap_map_theme.json
rename to src/module_vmap/module/forms/vmap_admin_map/vmap_admin_map_vmap_map_theme.json
diff --git a/vmap/client/modules/vmap/forms/vmap_admin_map/vmap_admin_map_vmap_services.json b/src/module_vmap/module/forms/vmap_admin_map/vmap_admin_map_vmap_services.json
similarity index 100%
rename from vmap/client/modules/vmap/forms/vmap_admin_map/vmap_admin_map_vmap_services.json
rename to src/module_vmap/module/forms/vmap_admin_map/vmap_admin_map_vmap_services.json
diff --git a/vmap/client/modules/vmap/forms/vmap_admin_module/vmap_admin_module_vmap_admin_module.json b/src/module_vmap/module/forms/vmap_admin_module/vmap_admin_module_vmap_admin_module.json
similarity index 100%
rename from vmap/client/modules/vmap/forms/vmap_admin_module/vmap_admin_module_vmap_admin_module.json
rename to src/module_vmap/module/forms/vmap_admin_module/vmap_admin_module_vmap_admin_module.json
diff --git a/vmap/client/modules/vmap/forms/vmap_admin_print/vmap_admin_print_vmap_admin_print_parameter.json b/src/module_vmap/module/forms/vmap_admin_print/vmap_admin_print_vmap_admin_print_parameter.json
similarity index 100%
rename from vmap/client/modules/vmap/forms/vmap_admin_print/vmap_admin_print_vmap_admin_print_parameter.json
rename to src/module_vmap/module/forms/vmap_admin_print/vmap_admin_print_vmap_admin_print_parameter.json
diff --git a/vmap/client/modules/vmap/forms/vmap_admin_print/vmap_admin_print_vmap_admin_style.json b/src/module_vmap/module/forms/vmap_admin_print/vmap_admin_print_vmap_admin_style.json
similarity index 100%
rename from vmap/client/modules/vmap/forms/vmap_admin_print/vmap_admin_print_vmap_admin_style.json
rename to src/module_vmap/module/forms/vmap_admin_print/vmap_admin_print_vmap_admin_style.json
diff --git a/vmap/client/modules/vmap/forms/vmap_admin_print/vmap_admin_print_vmap_admin_template.json b/src/module_vmap/module/forms/vmap_admin_print/vmap_admin_print_vmap_admin_template.json
similarity index 100%
rename from vmap/client/modules/vmap/forms/vmap_admin_print/vmap_admin_print_vmap_admin_template.json
rename to src/module_vmap/module/forms/vmap_admin_print/vmap_admin_print_vmap_admin_template.json
diff --git a/vmap/client/modules/vmap/forms/vmap_business_object/vmap_business_object_vmap_business_object.js b/src/module_vmap/module/forms/vmap_business_object/vmap_business_object_vmap_business_object.js
similarity index 100%
rename from vmap/client/modules/vmap/forms/vmap_business_object/vmap_business_object_vmap_business_object.js
rename to src/module_vmap/module/forms/vmap_business_object/vmap_business_object_vmap_business_object.js
diff --git a/vmap/client/modules/vmap/forms/vmap_business_object/vmap_business_object_vmap_business_object.json b/src/module_vmap/module/forms/vmap_business_object/vmap_business_object_vmap_business_object.json
similarity index 100%
rename from vmap/client/modules/vmap/forms/vmap_business_object/vmap_business_object_vmap_business_object.json
rename to src/module_vmap/module/forms/vmap_business_object/vmap_business_object_vmap_business_object.json
diff --git a/vmap/client/modules/vmap/forms/vmap_business_object/vmap_business_object_vmap_business_object_event.json b/src/module_vmap/module/forms/vmap_business_object/vmap_business_object_vmap_business_object_event.json
similarity index 100%
rename from vmap/client/modules/vmap/forms/vmap_business_object/vmap_business_object_vmap_business_object_event.json
rename to src/module_vmap/module/forms/vmap_business_object/vmap_business_object_vmap_business_object_event.json
diff --git a/vmap/client/modules/vmap/forms/vmap_business_object/vmap_business_object_vmap_business_object_printreport.json b/src/module_vmap/module/forms/vmap_business_object/vmap_business_object_vmap_business_object_printreport.json
similarity index 100%
rename from vmap/client/modules/vmap/forms/vmap_business_object/vmap_business_object_vmap_business_object_printreport.json
rename to src/module_vmap/module/forms/vmap_business_object/vmap_business_object_vmap_business_object_printreport.json
diff --git a/vmap/client/images/ajax-big-loader.GIF b/src/module_vmap/module/images/ajax-big-loader.GIF
similarity index 100%
rename from vmap/client/images/ajax-big-loader.GIF
rename to src/module_vmap/module/images/ajax-big-loader.GIF
diff --git a/vmap/client/images/ajax-load-big.gif b/src/module_vmap/module/images/ajax-load-big.gif
similarity index 100%
rename from vmap/client/images/ajax-load-big.gif
rename to src/module_vmap/module/images/ajax-load-big.gif
diff --git a/vmap/client/images/ajax-load.gif b/src/module_vmap/module/images/ajax-load.gif
similarity index 100%
rename from vmap/client/images/ajax-load.gif
rename to src/module_vmap/module/images/ajax-load.gif
diff --git a/vmap/client/modules/vmap/images/icon.png b/src/module_vmap/module/images/icon.png
similarity index 100%
rename from vmap/client/modules/vmap/images/icon.png
rename to src/module_vmap/module/images/icon.png
diff --git a/vmap/client/images/logo-veremes.jpg b/src/module_vmap/module/images/logo-veremes.jpg
similarity index 100%
rename from vmap/client/images/logo-veremes.jpg
rename to src/module_vmap/module/images/logo-veremes.jpg
diff --git a/vmap/client/modules/vmap/images/logo_departement_herault.jpg b/src/module_vmap/module/images/logo_departement_herault.jpg
similarity index 100%
rename from vmap/client/modules/vmap/images/logo_departement_herault.jpg
rename to src/module_vmap/module/images/logo_departement_herault.jpg
diff --git a/vmap/client/modules/vmap/images/transparent.png b/src/module_vmap/module/images/transparent.png
similarity index 100%
rename from vmap/client/modules/vmap/images/transparent.png
rename to src/module_vmap/module/images/transparent.png
diff --git a/vmap/client/modules/vmap/index-debug.html b/src/module_vmap/module/index-debug.html
similarity index 97%
rename from vmap/client/modules/vmap/index-debug.html
rename to src/module_vmap/module/index-debug.html
index 54cd5a6e47f54303c5c71fd5be24c1899d18c058..191640bbc8649b60e2d75a697cad18d2397573d9 100755
--- a/vmap/client/modules/vmap/index-debug.html
+++ b/src/module_vmap/module/index-debug.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-	<title>vmap 2018</title>
+	<title>vMap 2018</title>
 	<meta charset="utf-8">
 	<meta name="viewport" content="initial-scale=1.0, user-scalable=no, width=device-width">
 	<link rel="stylesheet" href="css/lib/bootstrap/css/bootstrap.min.css" type="text/css">
diff --git a/vmap/client/modules/vmap/index-vitis.html b/src/module_vmap/module/index-vitis.html
similarity index 100%
rename from vmap/client/modules/vmap/index-vitis.html
rename to src/module_vmap/module/index-vitis.html
diff --git a/vmap/client/modules/vmap/index.html b/src/module_vmap/module/index.html
similarity index 96%
rename from vmap/client/modules/vmap/index.html
rename to src/module_vmap/module/index.html
index 89fb327561222cf7d72efb51d8f9f97fad763a44..f3e28217ab7845d36868fb83426ca1e91ccc582b 100755
--- a/vmap/client/modules/vmap/index.html
+++ b/src/module_vmap/module/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 	<head>
-		<title>vMap 2018</title>
+		<title>vMap 2018.05</title>
 		<meta charset="utf-8">
 		<meta name="viewport" content="initial-scale=1.0, user-scalable=no, width=device-width">
 		<link rel="stylesheet" href="css/lib/bootstrap/css/bootstrap.min.css" type="text/css">
diff --git a/vmap/client/modules/vmap/javascript/app/modules/Cadastre/cadastre.js b/src/module_vmap/module/javascript/app/modules/Cadastre/cadastre.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/app/modules/Cadastre/cadastre.js
rename to src/module_vmap/module/javascript/app/modules/Cadastre/cadastre.js
diff --git a/vmap/client/modules/vmap/javascript/app/modules/Dessin/draw.js b/src/module_vmap/module/javascript/app/modules/Dessin/draw.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/app/modules/Dessin/draw.js
rename to src/module_vmap/module/javascript/app/modules/Dessin/draw.js
diff --git a/vmap/client/modules/vmap/javascript/app/modules/modules.list.js b/src/module_vmap/module/javascript/app/modules/modules.list.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/app/modules/modules.list.js
rename to src/module_vmap/module/javascript/app/modules/modules.list.js
diff --git a/vmap/client/modules/vmap/javascript/app/vmap/map/map.js b/src/module_vmap/module/javascript/app/vmap/map/map.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/app/vmap/map/map.js
rename to src/module_vmap/module/javascript/app/vmap/map/map.js
diff --git a/vmap/client/modules/vmap/javascript/app/vmap/map/mappopup.js b/src/module_vmap/module/javascript/app/vmap/map/mappopup.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/app/vmap/map/mappopup.js
rename to src/module_vmap/module/javascript/app/vmap/map/mappopup.js
diff --git a/vmap/client/modules/vmap/javascript/app/vmap/map/maptooltip.js b/src/module_vmap/module/javascript/app/vmap/map/maptooltip.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/app/vmap/map/maptooltip.js
rename to src/module_vmap/module/javascript/app/vmap/map/maptooltip.js
diff --git a/vmap/client/modules/vmap/javascript/app/vmap/mapmanager/layersorder.js b/src/module_vmap/module/javascript/app/vmap/mapmanager/layersorder.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/app/vmap/mapmanager/layersorder.js
rename to src/module_vmap/module/javascript/app/vmap/mapmanager/layersorder.js
diff --git a/vmap/client/modules/vmap/javascript/app/vmap/mapmanager/layerstree.js b/src/module_vmap/module/javascript/app/vmap/mapmanager/layerstree.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/app/vmap/mapmanager/layerstree.js
rename to src/module_vmap/module/javascript/app/vmap/mapmanager/layerstree.js
diff --git a/vmap/client/modules/vmap/javascript/app/vmap/mapmanager/maplegend.js b/src/module_vmap/module/javascript/app/vmap/mapmanager/maplegend.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/app/vmap/mapmanager/maplegend.js
rename to src/module_vmap/module/javascript/app/vmap/mapmanager/maplegend.js
diff --git a/vmap/client/modules/vmap/javascript/app/vmap/mapmanager/mapmanager.js b/src/module_vmap/module/javascript/app/vmap/mapmanager/mapmanager.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/app/vmap/mapmanager/mapmanager.js
rename to src/module_vmap/module/javascript/app/vmap/mapmanager/mapmanager.js
diff --git a/vmap/client/modules/vmap/javascript/app/vmap/mapmanager/mapmodal/bingsuggestions.js b/src/module_vmap/module/javascript/app/vmap/mapmanager/mapmodal/bingsuggestions.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/app/vmap/mapmanager/mapmodal/bingsuggestions.js
rename to src/module_vmap/module/javascript/app/vmap/mapmanager/mapmodal/bingsuggestions.js
diff --git a/vmap/client/modules/vmap/javascript/app/vmap/mapmanager/mapmodal/loadgeometry.js b/src/module_vmap/module/javascript/app/vmap/mapmanager/mapmodal/loadgeometry.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/app/vmap/mapmanager/mapmodal/loadgeometry.js
rename to src/module_vmap/module/javascript/app/vmap/mapmanager/mapmodal/loadgeometry.js
diff --git a/vmap/client/modules/vmap/javascript/app/vmap/mapmanager/mapmodal/maplist.js b/src/module_vmap/module/javascript/app/vmap/mapmanager/mapmodal/maplist.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/app/vmap/mapmanager/mapmodal/maplist.js
rename to src/module_vmap/module/javascript/app/vmap/mapmanager/mapmodal/maplist.js
diff --git a/vmap/client/modules/vmap/javascript/app/vmap/mapmanager/mapmodal/maplistlitle.js b/src/module_vmap/module/javascript/app/vmap/mapmanager/mapmodal/maplistlitle.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/app/vmap/mapmanager/mapmodal/maplistlitle.js
rename to src/module_vmap/module/javascript/app/vmap/mapmanager/mapmodal/maplistlitle.js
diff --git a/vmap/client/modules/vmap/javascript/app/vmap/mapmanager/mapmodal/mapmodal.js b/src/module_vmap/module/javascript/app/vmap/mapmanager/mapmodal/mapmodal.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/app/vmap/mapmanager/mapmodal/mapmodal.js
rename to src/module_vmap/module/javascript/app/vmap/mapmanager/mapmodal/mapmodal.js
diff --git a/vmap/client/modules/vmap/javascript/app/vmap/mapmanager/mapmodal/mymap.js b/src/module_vmap/module/javascript/app/vmap/mapmanager/mapmodal/mymap.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/app/vmap/mapmanager/mapmodal/mymap.js
rename to src/module_vmap/module/javascript/app/vmap/mapmanager/mapmodal/mymap.js
diff --git a/vmap/client/modules/vmap/javascript/app/vmap/mapmanager/mapmodal/osmsuggestions.js b/src/module_vmap/module/javascript/app/vmap/mapmanager/mapmodal/osmsuggestions.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/app/vmap/mapmanager/mapmodal/osmsuggestions.js
rename to src/module_vmap/module/javascript/app/vmap/mapmanager/mapmodal/osmsuggestions.js
diff --git a/vmap/client/modules/vmap/javascript/app/vmap/mapmanager/mapmodal/wmssuggestions.js b/src/module_vmap/module/javascript/app/vmap/mapmanager/mapmodal/wmssuggestions.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/app/vmap/mapmanager/mapmodal/wmssuggestions.js
rename to src/module_vmap/module/javascript/app/vmap/mapmanager/mapmodal/wmssuggestions.js
diff --git a/vmap/client/modules/vmap/javascript/app/vmap/mapmanager/mapmodal/wmtssuggestions.js b/src/module_vmap/module/javascript/app/vmap/mapmanager/mapmodal/wmtssuggestions.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/app/vmap/mapmanager/mapmodal/wmtssuggestions.js
rename to src/module_vmap/module/javascript/app/vmap/mapmanager/mapmodal/wmtssuggestions.js
diff --git a/vmap/client/modules/vmap/javascript/app/vmap/mapmanager/mapmodal/xyzsuggestions.js b/src/module_vmap/module/javascript/app/vmap/mapmanager/mapmodal/xyzsuggestions.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/app/vmap/mapmanager/mapmodal/xyzsuggestions.js
rename to src/module_vmap/module/javascript/app/vmap/mapmanager/mapmodal/xyzsuggestions.js
diff --git a/vmap/client/modules/vmap/javascript/app/vmap/requires.js b/src/module_vmap/module/javascript/app/vmap/requires.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/app/vmap/requires.js
rename to src/module_vmap/module/javascript/app/vmap/requires.js
diff --git a/vmap/client/modules/vmap/javascript/app/vmap/tools/basictools.js b/src/module_vmap/module/javascript/app/vmap/tools/basictools.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/app/vmap/tools/basictools.js
rename to src/module_vmap/module/javascript/app/vmap/tools/basictools.js
diff --git a/vmap/client/modules/vmap/javascript/app/vmap/tools/controls.js b/src/module_vmap/module/javascript/app/vmap/tools/controls.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/app/vmap/tools/controls.js
rename to src/module_vmap/module/javascript/app/vmap/tools/controls.js
diff --git a/vmap/client/modules/vmap/javascript/app/vmap/tools/infocontainer.js b/src/module_vmap/module/javascript/app/vmap/tools/infocontainer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/app/vmap/tools/infocontainer.js
rename to src/module_vmap/module/javascript/app/vmap/tools/infocontainer.js
diff --git a/vmap/client/modules/vmap/javascript/app/vmap/tools/insert.js b/src/module_vmap/module/javascript/app/vmap/tools/insert.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/app/vmap/tools/insert.js
rename to src/module_vmap/module/javascript/app/vmap/tools/insert.js
diff --git a/vmap/client/modules/vmap/javascript/app/vmap/tools/location.js b/src/module_vmap/module/javascript/app/vmap/tools/location.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/app/vmap/tools/location.js
rename to src/module_vmap/module/javascript/app/vmap/tools/location.js
diff --git a/vmap/client/modules/vmap/javascript/app/vmap/tools/measure.js b/src/module_vmap/module/javascript/app/vmap/tools/measure.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/app/vmap/tools/measure.js
rename to src/module_vmap/module/javascript/app/vmap/tools/measure.js
diff --git a/vmap/client/modules/vmap/javascript/app/vmap/tools/print.js b/src/module_vmap/module/javascript/app/vmap/tools/print.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/app/vmap/tools/print.js
rename to src/module_vmap/module/javascript/app/vmap/tools/print.js
diff --git a/vmap/client/modules/vmap/javascript/app/vmap/tools/printBox.js b/src/module_vmap/module/javascript/app/vmap/tools/printBox.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/app/vmap/tools/printBox.js
rename to src/module_vmap/module/javascript/app/vmap/tools/printBox.js
diff --git a/vmap/client/modules/vmap/javascript/app/vmap/tools/select/advancedselect.js b/src/module_vmap/module/javascript/app/vmap/tools/select/advancedselect.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/app/vmap/tools/select/advancedselect.js
rename to src/module_vmap/module/javascript/app/vmap/tools/select/advancedselect.js
diff --git a/vmap/client/modules/vmap/javascript/app/vmap/tools/select/basicselect.js b/src/module_vmap/module/javascript/app/vmap/tools/select/basicselect.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/app/vmap/tools/select/basicselect.js
rename to src/module_vmap/module/javascript/app/vmap/tools/select/basicselect.js
diff --git a/vmap/client/modules/vmap/javascript/app/vmap/tools/select/select.js b/src/module_vmap/module/javascript/app/vmap/tools/select/select.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/app/vmap/tools/select/select.js
rename to src/module_vmap/module/javascript/app/vmap/tools/select/select.js
diff --git a/vmap/client/modules/vmap/javascript/app/vmap/tools/toolsmanager.js b/src/module_vmap/module/javascript/app/vmap/tools/toolsmanager.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/app/vmap/tools/toolsmanager.js
rename to src/module_vmap/module/javascript/app/vmap/tools/toolsmanager.js
diff --git a/vmap/client/modules/vmap/javascript/app/vmap/tools/user.js b/src/module_vmap/module/javascript/app/vmap/tools/user.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/app/vmap/tools/user.js
rename to src/module_vmap/module/javascript/app/vmap/tools/user.js
diff --git a/vmap/client/modules/vmap/javascript/app/vmap/vmap.js b/src/module_vmap/module/javascript/app/vmap/vmap.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/app/vmap/vmap.js
rename to src/module_vmap/module/javascript/app/vmap/vmap.js
diff --git a/vmap/client/modules/vmap/javascript/app/vmap/vmap.jsdoc b/src/module_vmap/module/javascript/app/vmap/vmap.jsdoc
similarity index 100%
rename from vmap/client/modules/vmap/javascript/app/vmap/vmap.jsdoc
rename to src/module_vmap/module/javascript/app/vmap/vmap.jsdoc
diff --git a/vmap/client/modules/vmap/javascript/externs/bootstrap-table/LICENSE b/src/module_vmap/module/javascript/externs/bootstrap-table/LICENSE
similarity index 100%
rename from vmap/client/modules/vmap/javascript/externs/bootstrap-table/LICENSE
rename to src/module_vmap/module/javascript/externs/bootstrap-table/LICENSE
diff --git a/vmap/client/modules/vmap/javascript/externs/bootstrap-table/bootstrap-table-export.js b/src/module_vmap/module/javascript/externs/bootstrap-table/bootstrap-table-export.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/externs/bootstrap-table/bootstrap-table-export.js
rename to src/module_vmap/module/javascript/externs/bootstrap-table/bootstrap-table-export.js
diff --git a/vmap/client/modules/vmap/javascript/externs/bootstrap-table/bootstrap-table.js b/src/module_vmap/module/javascript/externs/bootstrap-table/bootstrap-table.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/externs/bootstrap-table/bootstrap-table.js
rename to src/module_vmap/module/javascript/externs/bootstrap-table/bootstrap-table.js
diff --git a/vmap/client/modules/vmap/javascript/externs/bootstrap-table/bootstrap-table.min.js b/src/module_vmap/module/javascript/externs/bootstrap-table/bootstrap-table.min.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/externs/bootstrap-table/bootstrap-table.min.js
rename to src/module_vmap/module/javascript/externs/bootstrap-table/bootstrap-table.min.js
diff --git a/vmap/client/modules/vmap/javascript/externs/bootstrap-table/tableExport.js b/src/module_vmap/module/javascript/externs/bootstrap-table/tableExport.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/externs/bootstrap-table/tableExport.js
rename to src/module_vmap/module/javascript/externs/bootstrap-table/tableExport.js
diff --git a/vmap/client/modules/vmap/javascript/externs/bootstrap-toggle/LICENSE b/src/module_vmap/module/javascript/externs/bootstrap-toggle/LICENSE
similarity index 100%
rename from vmap/client/modules/vmap/javascript/externs/bootstrap-toggle/LICENSE
rename to src/module_vmap/module/javascript/externs/bootstrap-toggle/LICENSE
diff --git a/vmap/client/modules/vmap/javascript/externs/bootstrap-toggle/bootstrap-toggle.min.js b/src/module_vmap/module/javascript/externs/bootstrap-toggle/bootstrap-toggle.min.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/externs/bootstrap-toggle/bootstrap-toggle.min.js
rename to src/module_vmap/module/javascript/externs/bootstrap-toggle/bootstrap-toggle.min.js
diff --git a/vmap/client/modules/vmap/javascript/externs/bootstrap-toggle/bootstrap-toggle.min.js.map b/src/module_vmap/module/javascript/externs/bootstrap-toggle/bootstrap-toggle.min.js.map
similarity index 100%
rename from vmap/client/modules/vmap/javascript/externs/bootstrap-toggle/bootstrap-toggle.min.js.map
rename to src/module_vmap/module/javascript/externs/bootstrap-toggle/bootstrap-toggle.min.js.map
diff --git a/vmap/client/modules/vmap/javascript/externs/html2canvas/LICENSE b/src/module_vmap/module/javascript/externs/html2canvas/LICENSE
similarity index 100%
rename from vmap/client/modules/vmap/javascript/externs/html2canvas/LICENSE
rename to src/module_vmap/module/javascript/externs/html2canvas/LICENSE
diff --git a/vmap/client/modules/vmap/javascript/externs/html2canvas/html2canvas.js b/src/module_vmap/module/javascript/externs/html2canvas/html2canvas.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/externs/html2canvas/html2canvas.js
rename to src/module_vmap/module/javascript/externs/html2canvas/html2canvas.js
diff --git a/vmap/client/modules/vmap/javascript/externs/jquery-sortable/LICENSE b/src/module_vmap/module/javascript/externs/jquery-sortable/LICENSE
similarity index 100%
rename from vmap/client/modules/vmap/javascript/externs/jquery-sortable/LICENSE
rename to src/module_vmap/module/javascript/externs/jquery-sortable/LICENSE
diff --git a/vmap/client/modules/vmap/javascript/externs/jquery-sortable/jquery-sortable.js b/src/module_vmap/module/javascript/externs/jquery-sortable/jquery-sortable.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/externs/jquery-sortable/jquery-sortable.js
rename to src/module_vmap/module/javascript/externs/jquery-sortable/jquery-sortable.js
diff --git a/vmap/client/modules/vmap/javascript/externs/jspdf/MIT-LICENSE.txt b/src/module_vmap/module/javascript/externs/jspdf/MIT-LICENSE.txt
similarity index 100%
rename from vmap/client/modules/vmap/javascript/externs/jspdf/MIT-LICENSE.txt
rename to src/module_vmap/module/javascript/externs/jspdf/MIT-LICENSE.txt
diff --git a/vmap/client/modules/vmap/javascript/externs/jspdf/jspdf.debug.js b/src/module_vmap/module/javascript/externs/jspdf/jspdf.debug.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/externs/jspdf/jspdf.debug.js
rename to src/module_vmap/module/javascript/externs/jspdf/jspdf.debug.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/VeremesTest.js b/src/module_vmap/module/javascript/test/e2e/VeremesTest.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/VeremesTest.js
rename to src/module_vmap/module/javascript/test/e2e/VeremesTest.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/cu_vmap_demo.bat b/src/module_vmap/module/javascript/test/e2e/cu_vmap_demo.bat
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/cu_vmap_demo.bat
rename to src/module_vmap/module/javascript/test/e2e/cu_vmap_demo.bat
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/.npmignore b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/.npmignore
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/.npmignore
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/.npmignore
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/README.md b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/README.md
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/README.md
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/README.md
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/index.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/index.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/index.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/index.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/.bin/mkdirp b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/.bin/mkdirp
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/.bin/mkdirp
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/.bin/mkdirp
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/.bin/mkdirp.cmd b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/.bin/mkdirp.cmd
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/.bin/mkdirp.cmd
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/.bin/mkdirp.cmd
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/hat/README.markdown b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/hat/README.markdown
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/hat/README.markdown
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/hat/README.markdown
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/hat/example/hat.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/hat/example/hat.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/hat/example/hat.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/hat/example/hat.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/hat/example/rack.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/hat/example/rack.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/hat/example/rack.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/hat/example/rack.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/hat/index.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/hat/index.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/hat/index.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/hat/index.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/hat/package.json b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/hat/package.json
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/hat/package.json
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/hat/package.json
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/hat/test/id.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/hat/test/id.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/hat/test/id.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/hat/test/id.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/hat/test/rack.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/hat/test/rack.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/hat/test/rack.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/hat/test/rack.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/LICENSE b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/LICENSE
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/LICENSE
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/LICENSE
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/README.md b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/README.md
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/README.md
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/README.md
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/chunk.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/chunk.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/chunk.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/chunk.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/compact.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/compact.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/compact.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/compact.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/difference.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/difference.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/difference.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/difference.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/drop.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/drop.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/drop.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/drop.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/dropRight.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/dropRight.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/dropRight.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/dropRight.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/dropRightWhile.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/dropRightWhile.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/dropRightWhile.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/dropRightWhile.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/dropWhile.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/dropWhile.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/dropWhile.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/dropWhile.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/fill.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/fill.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/fill.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/fill.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/findIndex.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/findIndex.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/findIndex.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/findIndex.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/findLastIndex.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/findLastIndex.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/findLastIndex.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/findLastIndex.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/first.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/first.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/first.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/first.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/flatten.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/flatten.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/flatten.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/flatten.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/flattenDeep.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/flattenDeep.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/flattenDeep.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/flattenDeep.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/head.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/head.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/head.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/head.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/indexOf.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/indexOf.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/indexOf.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/indexOf.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/initial.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/initial.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/initial.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/initial.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/intersection.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/intersection.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/intersection.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/intersection.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/last.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/last.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/last.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/last.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/lastIndexOf.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/lastIndexOf.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/lastIndexOf.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/lastIndexOf.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/object.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/object.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/object.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/object.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/pull.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/pull.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/pull.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/pull.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/pullAt.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/pullAt.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/pullAt.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/pullAt.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/remove.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/remove.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/remove.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/remove.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/rest.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/rest.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/rest.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/rest.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/slice.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/slice.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/slice.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/slice.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/sortedIndex.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/sortedIndex.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/sortedIndex.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/sortedIndex.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/sortedLastIndex.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/sortedLastIndex.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/sortedLastIndex.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/sortedLastIndex.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/tail.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/tail.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/tail.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/tail.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/take.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/take.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/take.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/take.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/takeRight.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/takeRight.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/takeRight.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/takeRight.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/takeRightWhile.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/takeRightWhile.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/takeRightWhile.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/takeRightWhile.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/takeWhile.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/takeWhile.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/takeWhile.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/takeWhile.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/union.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/union.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/union.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/union.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/uniq.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/uniq.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/uniq.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/uniq.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/unique.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/unique.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/unique.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/unique.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/unzip.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/unzip.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/unzip.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/unzip.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/unzipWith.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/unzipWith.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/unzipWith.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/unzipWith.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/without.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/without.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/without.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/without.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/xor.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/xor.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/xor.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/xor.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/zip.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/zip.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/zip.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/zip.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/zipObject.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/zipObject.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/zipObject.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/zipObject.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/zipWith.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/zipWith.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/zipWith.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/zipWith.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/chain.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/chain.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/chain.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/chain.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/commit.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/commit.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/commit.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/commit.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/concat.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/concat.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/concat.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/concat.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/lodash.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/lodash.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/lodash.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/lodash.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/plant.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/plant.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/plant.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/plant.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/reverse.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/reverse.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/reverse.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/reverse.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/run.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/run.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/run.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/run.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/tap.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/tap.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/tap.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/tap.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/thru.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/thru.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/thru.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/thru.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/toJSON.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/toJSON.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/toJSON.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/toJSON.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/toString.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/toString.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/toString.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/toString.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/value.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/value.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/value.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/value.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/valueOf.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/valueOf.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/valueOf.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/valueOf.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/wrapperChain.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/wrapperChain.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/wrapperChain.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/wrapperChain.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/wrapperCommit.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/wrapperCommit.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/wrapperCommit.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/wrapperCommit.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/wrapperConcat.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/wrapperConcat.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/wrapperConcat.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/wrapperConcat.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/wrapperPlant.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/wrapperPlant.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/wrapperPlant.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/wrapperPlant.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/wrapperReverse.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/wrapperReverse.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/wrapperReverse.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/wrapperReverse.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/wrapperToString.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/wrapperToString.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/wrapperToString.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/wrapperToString.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/wrapperValue.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/wrapperValue.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/wrapperValue.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/wrapperValue.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/all.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/all.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/all.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/all.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/any.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/any.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/any.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/any.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/at.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/at.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/at.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/at.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/collect.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/collect.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/collect.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/collect.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/contains.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/contains.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/contains.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/contains.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/countBy.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/countBy.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/countBy.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/countBy.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/detect.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/detect.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/detect.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/detect.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/each.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/each.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/each.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/each.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/eachRight.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/eachRight.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/eachRight.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/eachRight.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/every.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/every.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/every.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/every.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/filter.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/filter.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/filter.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/filter.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/find.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/find.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/find.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/find.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/findLast.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/findLast.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/findLast.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/findLast.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/findWhere.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/findWhere.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/findWhere.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/findWhere.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/foldl.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/foldl.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/foldl.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/foldl.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/foldr.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/foldr.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/foldr.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/foldr.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/forEach.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/forEach.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/forEach.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/forEach.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/forEachRight.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/forEachRight.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/forEachRight.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/forEachRight.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/groupBy.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/groupBy.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/groupBy.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/groupBy.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/include.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/include.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/include.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/include.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/includes.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/includes.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/includes.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/includes.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/indexBy.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/indexBy.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/indexBy.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/indexBy.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/inject.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/inject.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/inject.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/inject.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/invoke.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/invoke.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/invoke.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/invoke.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/map.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/map.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/map.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/map.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/max.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/max.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/max.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/max.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/min.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/min.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/min.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/min.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/partition.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/partition.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/partition.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/partition.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/pluck.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/pluck.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/pluck.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/pluck.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/reduce.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/reduce.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/reduce.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/reduce.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/reduceRight.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/reduceRight.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/reduceRight.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/reduceRight.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/reject.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/reject.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/reject.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/reject.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/sample.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/sample.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/sample.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/sample.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/select.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/select.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/select.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/select.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/shuffle.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/shuffle.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/shuffle.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/shuffle.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/size.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/size.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/size.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/size.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/some.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/some.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/some.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/some.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/sortBy.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/sortBy.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/sortBy.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/sortBy.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/sortByAll.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/sortByAll.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/sortByAll.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/sortByAll.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/sortByOrder.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/sortByOrder.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/sortByOrder.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/sortByOrder.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/sum.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/sum.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/sum.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/sum.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/where.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/where.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/where.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/where.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/date.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/date.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/date.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/date.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/date/now.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/date/now.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/date/now.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/date/now.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/after.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/after.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/after.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/after.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/ary.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/ary.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/ary.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/ary.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/backflow.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/backflow.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/backflow.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/backflow.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/before.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/before.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/before.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/before.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/bind.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/bind.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/bind.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/bind.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/bindAll.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/bindAll.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/bindAll.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/bindAll.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/bindKey.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/bindKey.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/bindKey.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/bindKey.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/compose.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/compose.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/compose.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/compose.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/curry.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/curry.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/curry.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/curry.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/curryRight.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/curryRight.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/curryRight.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/curryRight.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/debounce.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/debounce.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/debounce.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/debounce.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/defer.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/defer.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/defer.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/defer.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/delay.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/delay.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/delay.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/delay.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/flow.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/flow.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/flow.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/flow.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/flowRight.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/flowRight.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/flowRight.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/flowRight.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/memoize.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/memoize.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/memoize.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/memoize.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/modArgs.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/modArgs.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/modArgs.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/modArgs.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/negate.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/negate.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/negate.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/negate.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/once.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/once.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/once.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/once.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/partial.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/partial.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/partial.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/partial.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/partialRight.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/partialRight.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/partialRight.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/partialRight.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/rearg.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/rearg.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/rearg.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/rearg.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/restParam.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/restParam.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/restParam.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/restParam.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/spread.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/spread.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/spread.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/spread.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/throttle.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/throttle.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/throttle.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/throttle.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/wrap.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/wrap.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/wrap.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/wrap.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/index.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/index.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/index.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/index.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/LazyWrapper.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/LazyWrapper.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/LazyWrapper.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/LazyWrapper.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/LodashWrapper.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/LodashWrapper.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/LodashWrapper.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/LodashWrapper.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/MapCache.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/MapCache.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/MapCache.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/MapCache.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/SetCache.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/SetCache.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/SetCache.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/SetCache.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayConcat.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayConcat.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayConcat.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayConcat.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayCopy.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayCopy.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayCopy.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayCopy.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayEach.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayEach.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayEach.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayEach.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayEachRight.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayEachRight.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayEachRight.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayEachRight.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayEvery.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayEvery.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayEvery.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayEvery.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayExtremum.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayExtremum.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayExtremum.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayExtremum.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayFilter.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayFilter.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayFilter.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayFilter.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayMap.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayMap.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayMap.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayMap.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayPush.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayPush.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayPush.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayPush.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayReduce.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayReduce.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayReduce.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayReduce.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayReduceRight.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayReduceRight.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayReduceRight.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayReduceRight.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arraySome.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arraySome.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arraySome.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arraySome.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arraySum.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arraySum.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arraySum.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arraySum.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/assignDefaults.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/assignDefaults.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/assignDefaults.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/assignDefaults.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/assignOwnDefaults.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/assignOwnDefaults.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/assignOwnDefaults.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/assignOwnDefaults.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/assignWith.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/assignWith.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/assignWith.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/assignWith.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseAssign.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseAssign.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseAssign.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseAssign.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseAt.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseAt.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseAt.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseAt.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseCallback.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseCallback.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseCallback.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseCallback.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseClone.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseClone.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseClone.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseClone.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseCompareAscending.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseCompareAscending.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseCompareAscending.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseCompareAscending.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseCopy.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseCopy.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseCopy.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseCopy.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseCreate.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseCreate.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseCreate.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseCreate.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseDelay.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseDelay.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseDelay.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseDelay.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseDifference.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseDifference.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseDifference.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseDifference.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseEach.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseEach.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseEach.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseEach.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseEachRight.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseEachRight.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseEachRight.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseEachRight.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseEvery.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseEvery.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseEvery.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseEvery.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseExtremum.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseExtremum.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseExtremum.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseExtremum.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseFill.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseFill.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseFill.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseFill.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseFilter.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseFilter.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseFilter.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseFilter.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseFind.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseFind.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseFind.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseFind.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseFindIndex.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseFindIndex.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseFindIndex.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseFindIndex.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseFlatten.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseFlatten.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseFlatten.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseFlatten.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseFor.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseFor.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseFor.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseFor.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseForIn.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseForIn.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseForIn.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseForIn.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseForOwn.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseForOwn.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseForOwn.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseForOwn.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseForOwnRight.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseForOwnRight.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseForOwnRight.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseForOwnRight.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseForRight.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseForRight.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseForRight.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseForRight.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseFunctions.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseFunctions.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseFunctions.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseFunctions.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseGet.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseGet.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseGet.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseGet.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseIndexOf.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseIndexOf.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseIndexOf.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseIndexOf.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseIsEqual.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseIsEqual.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseIsEqual.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseIsEqual.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseIsEqualDeep.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseIsEqualDeep.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseIsEqualDeep.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseIsEqualDeep.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseIsFunction.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseIsFunction.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseIsFunction.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseIsFunction.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseIsMatch.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseIsMatch.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseIsMatch.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseIsMatch.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseLodash.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseLodash.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseLodash.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseLodash.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseMap.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseMap.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseMap.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseMap.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseMatches.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseMatches.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseMatches.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseMatches.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseMatchesProperty.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseMatchesProperty.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseMatchesProperty.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseMatchesProperty.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseMerge.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseMerge.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseMerge.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseMerge.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseMergeDeep.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseMergeDeep.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseMergeDeep.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseMergeDeep.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseProperty.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseProperty.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseProperty.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseProperty.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/basePropertyDeep.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/basePropertyDeep.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/basePropertyDeep.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/basePropertyDeep.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/basePullAt.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/basePullAt.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/basePullAt.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/basePullAt.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseRandom.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseRandom.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseRandom.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseRandom.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseReduce.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseReduce.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseReduce.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseReduce.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseSetData.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseSetData.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseSetData.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseSetData.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseSlice.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseSlice.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseSlice.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseSlice.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseSome.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseSome.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseSome.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseSome.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseSortBy.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseSortBy.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseSortBy.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseSortBy.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseSortByOrder.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseSortByOrder.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseSortByOrder.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseSortByOrder.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseSum.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseSum.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseSum.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseSum.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseToString.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseToString.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseToString.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseToString.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseUniq.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseUniq.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseUniq.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseUniq.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseValues.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseValues.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseValues.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseValues.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseWhile.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseWhile.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseWhile.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseWhile.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseWrapperValue.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseWrapperValue.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseWrapperValue.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseWrapperValue.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/binaryIndex.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/binaryIndex.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/binaryIndex.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/binaryIndex.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/binaryIndexBy.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/binaryIndexBy.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/binaryIndexBy.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/binaryIndexBy.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/bindCallback.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/bindCallback.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/bindCallback.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/bindCallback.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/bufferClone.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/bufferClone.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/bufferClone.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/bufferClone.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/cacheIndexOf.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/cacheIndexOf.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/cacheIndexOf.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/cacheIndexOf.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/cachePush.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/cachePush.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/cachePush.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/cachePush.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/charsLeftIndex.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/charsLeftIndex.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/charsLeftIndex.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/charsLeftIndex.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/charsRightIndex.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/charsRightIndex.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/charsRightIndex.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/charsRightIndex.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/compareAscending.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/compareAscending.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/compareAscending.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/compareAscending.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/compareMultiple.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/compareMultiple.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/compareMultiple.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/compareMultiple.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/composeArgs.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/composeArgs.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/composeArgs.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/composeArgs.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/composeArgsRight.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/composeArgsRight.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/composeArgsRight.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/composeArgsRight.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createAggregator.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createAggregator.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createAggregator.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createAggregator.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createAssigner.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createAssigner.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createAssigner.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createAssigner.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createBaseEach.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createBaseEach.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createBaseEach.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createBaseEach.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createBaseFor.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createBaseFor.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createBaseFor.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createBaseFor.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createBindWrapper.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createBindWrapper.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createBindWrapper.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createBindWrapper.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createCache.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createCache.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createCache.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createCache.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createCompounder.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createCompounder.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createCompounder.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createCompounder.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createCtorWrapper.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createCtorWrapper.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createCtorWrapper.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createCtorWrapper.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createCurry.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createCurry.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createCurry.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createCurry.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createDefaults.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createDefaults.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createDefaults.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createDefaults.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createExtremum.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createExtremum.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createExtremum.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createExtremum.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createFind.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createFind.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createFind.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createFind.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createFindIndex.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createFindIndex.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createFindIndex.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createFindIndex.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createFindKey.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createFindKey.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createFindKey.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createFindKey.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createFlow.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createFlow.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createFlow.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createFlow.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createForEach.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createForEach.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createForEach.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createForEach.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createForIn.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createForIn.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createForIn.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createForIn.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createForOwn.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createForOwn.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createForOwn.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createForOwn.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createHybridWrapper.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createHybridWrapper.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createHybridWrapper.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createHybridWrapper.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createObjectMapper.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createObjectMapper.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createObjectMapper.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createObjectMapper.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createPadDir.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createPadDir.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createPadDir.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createPadDir.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createPadding.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createPadding.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createPadding.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createPadding.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createPartial.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createPartial.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createPartial.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createPartial.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createPartialWrapper.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createPartialWrapper.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createPartialWrapper.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createPartialWrapper.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createReduce.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createReduce.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createReduce.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createReduce.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createRound.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createRound.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createRound.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createRound.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createSortedIndex.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createSortedIndex.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createSortedIndex.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createSortedIndex.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createWrapper.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createWrapper.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createWrapper.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createWrapper.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/deburrLetter.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/deburrLetter.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/deburrLetter.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/deburrLetter.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/equalArrays.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/equalArrays.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/equalArrays.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/equalArrays.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/equalByTag.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/equalByTag.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/equalByTag.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/equalByTag.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/equalObjects.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/equalObjects.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/equalObjects.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/equalObjects.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/escapeHtmlChar.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/escapeHtmlChar.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/escapeHtmlChar.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/escapeHtmlChar.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/escapeRegExpChar.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/escapeRegExpChar.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/escapeRegExpChar.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/escapeRegExpChar.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/escapeStringChar.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/escapeStringChar.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/escapeStringChar.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/escapeStringChar.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/getData.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/getData.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/getData.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/getData.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/getFuncName.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/getFuncName.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/getFuncName.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/getFuncName.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/getLength.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/getLength.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/getLength.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/getLength.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/getMatchData.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/getMatchData.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/getMatchData.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/getMatchData.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/getNative.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/getNative.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/getNative.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/getNative.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/getView.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/getView.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/getView.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/getView.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/indexOfNaN.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/indexOfNaN.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/indexOfNaN.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/indexOfNaN.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/initCloneArray.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/initCloneArray.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/initCloneArray.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/initCloneArray.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/initCloneByTag.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/initCloneByTag.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/initCloneByTag.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/initCloneByTag.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/initCloneObject.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/initCloneObject.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/initCloneObject.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/initCloneObject.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/invokePath.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/invokePath.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/invokePath.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/invokePath.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isArrayLike.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isArrayLike.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isArrayLike.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isArrayLike.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isIndex.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isIndex.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isIndex.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isIndex.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isIterateeCall.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isIterateeCall.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isIterateeCall.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isIterateeCall.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isKey.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isKey.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isKey.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isKey.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isLaziable.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isLaziable.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isLaziable.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isLaziable.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isLength.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isLength.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isLength.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isLength.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isObjectLike.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isObjectLike.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isObjectLike.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isObjectLike.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isSpace.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isSpace.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isSpace.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isSpace.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isStrictComparable.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isStrictComparable.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isStrictComparable.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isStrictComparable.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/lazyClone.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/lazyClone.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/lazyClone.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/lazyClone.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/lazyReverse.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/lazyReverse.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/lazyReverse.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/lazyReverse.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/lazyValue.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/lazyValue.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/lazyValue.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/lazyValue.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/mapDelete.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/mapDelete.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/mapDelete.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/mapDelete.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/mapGet.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/mapGet.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/mapGet.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/mapGet.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/mapHas.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/mapHas.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/mapHas.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/mapHas.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/mapSet.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/mapSet.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/mapSet.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/mapSet.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/mergeData.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/mergeData.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/mergeData.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/mergeData.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/mergeDefaults.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/mergeDefaults.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/mergeDefaults.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/mergeDefaults.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/metaMap.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/metaMap.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/metaMap.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/metaMap.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/pickByArray.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/pickByArray.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/pickByArray.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/pickByArray.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/pickByCallback.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/pickByCallback.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/pickByCallback.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/pickByCallback.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/reEscape.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/reEscape.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/reEscape.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/reEscape.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/reEvaluate.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/reEvaluate.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/reEvaluate.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/reEvaluate.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/reInterpolate.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/reInterpolate.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/reInterpolate.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/reInterpolate.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/realNames.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/realNames.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/realNames.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/realNames.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/reorder.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/reorder.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/reorder.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/reorder.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/replaceHolders.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/replaceHolders.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/replaceHolders.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/replaceHolders.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/setData.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/setData.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/setData.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/setData.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/shimKeys.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/shimKeys.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/shimKeys.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/shimKeys.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/sortedUniq.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/sortedUniq.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/sortedUniq.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/sortedUniq.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/toIterable.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/toIterable.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/toIterable.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/toIterable.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/toObject.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/toObject.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/toObject.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/toObject.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/toPath.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/toPath.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/toPath.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/toPath.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/trimmedLeftIndex.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/trimmedLeftIndex.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/trimmedLeftIndex.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/trimmedLeftIndex.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/trimmedRightIndex.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/trimmedRightIndex.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/trimmedRightIndex.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/trimmedRightIndex.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/unescapeHtmlChar.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/unescapeHtmlChar.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/unescapeHtmlChar.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/unescapeHtmlChar.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/wrapperClone.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/wrapperClone.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/wrapperClone.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/wrapperClone.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/clone.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/clone.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/clone.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/clone.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/cloneDeep.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/cloneDeep.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/cloneDeep.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/cloneDeep.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/eq.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/eq.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/eq.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/eq.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/gt.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/gt.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/gt.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/gt.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/gte.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/gte.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/gte.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/gte.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isArguments.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isArguments.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isArguments.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isArguments.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isArray.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isArray.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isArray.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isArray.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isBoolean.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isBoolean.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isBoolean.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isBoolean.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isDate.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isDate.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isDate.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isDate.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isElement.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isElement.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isElement.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isElement.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isEmpty.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isEmpty.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isEmpty.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isEmpty.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isEqual.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isEqual.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isEqual.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isEqual.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isError.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isError.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isError.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isError.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isFinite.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isFinite.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isFinite.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isFinite.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isFunction.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isFunction.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isFunction.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isFunction.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isMatch.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isMatch.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isMatch.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isMatch.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isNaN.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isNaN.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isNaN.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isNaN.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isNative.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isNative.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isNative.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isNative.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isNull.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isNull.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isNull.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isNull.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isNumber.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isNumber.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isNumber.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isNumber.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isObject.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isObject.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isObject.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isObject.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isPlainObject.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isPlainObject.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isPlainObject.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isPlainObject.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isRegExp.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isRegExp.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isRegExp.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isRegExp.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isString.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isString.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isString.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isString.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isTypedArray.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isTypedArray.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isTypedArray.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isTypedArray.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isUndefined.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isUndefined.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isUndefined.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isUndefined.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/lt.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/lt.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/lt.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/lt.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/lte.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/lte.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/lte.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/lte.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/toArray.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/toArray.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/toArray.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/toArray.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/toPlainObject.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/toPlainObject.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/toPlainObject.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/toPlainObject.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math/add.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math/add.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math/add.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math/add.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math/ceil.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math/ceil.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math/ceil.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math/ceil.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math/floor.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math/floor.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math/floor.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math/floor.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math/max.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math/max.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math/max.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math/max.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math/min.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math/min.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math/min.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math/min.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math/round.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math/round.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math/round.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math/round.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math/sum.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math/sum.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math/sum.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math/sum.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/number.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/number.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/number.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/number.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/number/inRange.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/number/inRange.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/number/inRange.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/number/inRange.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/number/random.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/number/random.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/number/random.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/number/random.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/assign.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/assign.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/assign.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/assign.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/create.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/create.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/create.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/create.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/defaults.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/defaults.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/defaults.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/defaults.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/defaultsDeep.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/defaultsDeep.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/defaultsDeep.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/defaultsDeep.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/extend.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/extend.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/extend.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/extend.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/findKey.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/findKey.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/findKey.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/findKey.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/findLastKey.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/findLastKey.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/findLastKey.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/findLastKey.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/forIn.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/forIn.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/forIn.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/forIn.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/forInRight.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/forInRight.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/forInRight.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/forInRight.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/forOwn.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/forOwn.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/forOwn.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/forOwn.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/forOwnRight.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/forOwnRight.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/forOwnRight.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/forOwnRight.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/functions.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/functions.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/functions.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/functions.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/get.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/get.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/get.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/get.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/has.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/has.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/has.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/has.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/invert.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/invert.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/invert.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/invert.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/keys.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/keys.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/keys.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/keys.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/keysIn.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/keysIn.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/keysIn.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/keysIn.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/mapKeys.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/mapKeys.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/mapKeys.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/mapKeys.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/mapValues.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/mapValues.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/mapValues.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/mapValues.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/merge.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/merge.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/merge.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/merge.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/methods.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/methods.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/methods.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/methods.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/omit.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/omit.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/omit.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/omit.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/pairs.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/pairs.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/pairs.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/pairs.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/pick.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/pick.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/pick.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/pick.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/result.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/result.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/result.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/result.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/set.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/set.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/set.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/set.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/transform.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/transform.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/transform.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/transform.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/values.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/values.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/values.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/values.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/valuesIn.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/valuesIn.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/valuesIn.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/valuesIn.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/package.json b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/package.json
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/package.json
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/package.json
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/camelCase.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/camelCase.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/camelCase.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/camelCase.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/capitalize.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/capitalize.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/capitalize.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/capitalize.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/deburr.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/deburr.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/deburr.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/deburr.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/endsWith.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/endsWith.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/endsWith.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/endsWith.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/escape.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/escape.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/escape.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/escape.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/escapeRegExp.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/escapeRegExp.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/escapeRegExp.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/escapeRegExp.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/kebabCase.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/kebabCase.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/kebabCase.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/kebabCase.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/pad.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/pad.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/pad.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/pad.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/padLeft.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/padLeft.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/padLeft.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/padLeft.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/padRight.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/padRight.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/padRight.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/padRight.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/parseInt.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/parseInt.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/parseInt.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/parseInt.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/repeat.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/repeat.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/repeat.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/repeat.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/snakeCase.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/snakeCase.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/snakeCase.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/snakeCase.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/startCase.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/startCase.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/startCase.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/startCase.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/startsWith.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/startsWith.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/startsWith.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/startsWith.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/template.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/template.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/template.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/template.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/templateSettings.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/templateSettings.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/templateSettings.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/templateSettings.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/trim.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/trim.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/trim.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/trim.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/trimLeft.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/trimLeft.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/trimLeft.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/trimLeft.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/trimRight.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/trimRight.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/trimRight.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/trimRight.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/trunc.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/trunc.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/trunc.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/trunc.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/unescape.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/unescape.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/unescape.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/unescape.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/words.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/words.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/words.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/words.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/support.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/support.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/support.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/support.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/attempt.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/attempt.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/attempt.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/attempt.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/callback.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/callback.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/callback.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/callback.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/constant.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/constant.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/constant.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/constant.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/identity.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/identity.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/identity.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/identity.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/iteratee.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/iteratee.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/iteratee.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/iteratee.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/matches.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/matches.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/matches.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/matches.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/matchesProperty.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/matchesProperty.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/matchesProperty.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/matchesProperty.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/method.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/method.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/method.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/method.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/methodOf.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/methodOf.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/methodOf.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/methodOf.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/mixin.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/mixin.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/mixin.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/mixin.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/noop.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/noop.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/noop.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/noop.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/property.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/property.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/property.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/property.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/propertyOf.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/propertyOf.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/propertyOf.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/propertyOf.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/range.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/range.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/range.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/range.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/times.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/times.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/times.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/times.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/uniqueId.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/uniqueId.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/uniqueId.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/uniqueId.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/.travis.yml b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/.travis.yml
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/.travis.yml
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/.travis.yml
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/LICENSE b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/LICENSE
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/LICENSE
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/LICENSE
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/bin/cmd.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/bin/cmd.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/bin/cmd.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/bin/cmd.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/bin/usage.txt b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/bin/usage.txt
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/bin/usage.txt
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/bin/usage.txt
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/examples/pow.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/examples/pow.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/examples/pow.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/examples/pow.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/index.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/index.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/index.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/index.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/.travis.yml b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/.travis.yml
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/.travis.yml
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/.travis.yml
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/LICENSE b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/LICENSE
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/LICENSE
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/LICENSE
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/example/parse.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/example/parse.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/example/parse.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/example/parse.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/index.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/index.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/index.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/index.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/package.json b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/package.json
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/package.json
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/package.json
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/readme.markdown b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/readme.markdown
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/readme.markdown
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/readme.markdown
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/dash.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/dash.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/dash.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/dash.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/default_bool.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/default_bool.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/default_bool.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/default_bool.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/dotted.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/dotted.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/dotted.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/dotted.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/long.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/long.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/long.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/long.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/parse.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/parse.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/parse.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/parse.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/parse_modified.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/parse_modified.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/parse_modified.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/parse_modified.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/short.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/short.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/short.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/short.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/whitespace.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/whitespace.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/whitespace.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/whitespace.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/package.json b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/package.json
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/package.json
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/package.json
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/readme.markdown b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/readme.markdown
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/readme.markdown
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/readme.markdown
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/chmod.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/chmod.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/chmod.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/chmod.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/clobber.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/clobber.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/clobber.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/clobber.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/mkdirp.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/mkdirp.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/mkdirp.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/mkdirp.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/opts_fs.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/opts_fs.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/opts_fs.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/opts_fs.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/opts_fs_sync.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/opts_fs_sync.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/opts_fs_sync.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/opts_fs_sync.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/perm.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/perm.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/perm.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/perm.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/perm_sync.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/perm_sync.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/perm_sync.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/perm_sync.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/race.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/race.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/race.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/race.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/rel.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/rel.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/rel.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/rel.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/return.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/return.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/return.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/return.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/return_sync.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/return_sync.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/return_sync.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/return_sync.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/root.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/root.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/root.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/root.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/sync.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/sync.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/sync.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/sync.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/umask.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/umask.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/umask.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/umask.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/umask_sync.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/umask_sync.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/umask_sync.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/umask_sync.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/string.prototype.startswith/LICENSE-MIT.txt b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/string.prototype.startswith/LICENSE-MIT.txt
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/string.prototype.startswith/LICENSE-MIT.txt
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/string.prototype.startswith/LICENSE-MIT.txt
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/string.prototype.startswith/README.md b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/string.prototype.startswith/README.md
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/string.prototype.startswith/README.md
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/string.prototype.startswith/README.md
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/string.prototype.startswith/package.json b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/string.prototype.startswith/package.json
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/string.prototype.startswith/package.json
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/string.prototype.startswith/package.json
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/string.prototype.startswith/startswith.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/string.prototype.startswith/startswith.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/string.prototype.startswith/startswith.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/string.prototype.startswith/startswith.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/package.json b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/package.json
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/package.json
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/package.json
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/protractor.config.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/protractor.config.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/protractor.config.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/protractor.config.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/template.html b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/template.html
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/template.html
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/template.html
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/test/test2Spec.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/test/test2Spec.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/test/test2Spec.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/test/test2Spec.js
diff --git a/vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/test/testSpec.js b/src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/test/testSpec.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/test/testSpec.js
rename to src/module_vmap/module/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/test/testSpec.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/protractor.conf.js b/src/module_vmap/module/javascript/test/e2e/protractor.conf.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/protractor.conf.js
rename to src/module_vmap/module/javascript/test/e2e/protractor.conf.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/scenario/sc_vmap_demo.js b/src/module_vmap/module/javascript/test/e2e/scenario/sc_vmap_demo.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/scenario/sc_vmap_demo.js
rename to src/module_vmap/module/javascript/test/e2e/scenario/sc_vmap_demo.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/Starting_test.bat b/src/module_vmap/module/javascript/test/unit/Starting_test.bat
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/Starting_test.bat
rename to src/module_vmap/module/javascript/test/unit/Starting_test.bat
diff --git a/vmap/client/modules/vmap/javascript/test/unit/Starting_test_with_report.bat b/src/module_vmap/module/javascript/test/unit/Starting_test_with_report.bat
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/Starting_test_with_report.bat
rename to src/module_vmap/module/javascript/test/unit/Starting_test_with_report.bat
diff --git a/vmap/client/modules/vmap/javascript/test/unit/depsbuilder.bat b/src/module_vmap/module/javascript/test/unit/depsbuilder.bat
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/depsbuilder.bat
rename to src/module_vmap/module/javascript/test/unit/depsbuilder.bat
diff --git a/vmap/client/modules/vmap/javascript/test/unit/karma.conf.js b/src/module_vmap/module/javascript/test/unit/karma.conf.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/karma.conf.js
rename to src/module_vmap/module/javascript/test/unit/karma.conf.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/modiftotest.txt b/src/module_vmap/module/javascript/test/unit/modiftotest.txt
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/modiftotest.txt
rename to src/module_vmap/module/javascript/test/unit/modiftotest.txt
diff --git a/vmap/client/modules/vmap/javascript/test/unit/pyt/closurebuilder.py b/src/module_vmap/module/javascript/test/unit/pyt/closurebuilder.py
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/pyt/closurebuilder.py
rename to src/module_vmap/module/javascript/test/unit/pyt/closurebuilder.py
diff --git a/vmap/client/modules/vmap/javascript/test/unit/pyt/depstree.py b/src/module_vmap/module/javascript/test/unit/pyt/depstree.py
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/pyt/depstree.py
rename to src/module_vmap/module/javascript/test/unit/pyt/depstree.py
diff --git a/vmap/client/modules/vmap/javascript/test/unit/pyt/depstree_test.py b/src/module_vmap/module/javascript/test/unit/pyt/depstree_test.py
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/pyt/depstree_test.py
rename to src/module_vmap/module/javascript/test/unit/pyt/depstree_test.py
diff --git a/vmap/client/modules/vmap/javascript/test/unit/pyt/depswriter.py b/src/module_vmap/module/javascript/test/unit/pyt/depswriter.py
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/pyt/depswriter.py
rename to src/module_vmap/module/javascript/test/unit/pyt/depswriter.py
diff --git a/vmap/client/modules/vmap/javascript/test/unit/pyt/jscompiler.py b/src/module_vmap/module/javascript/test/unit/pyt/jscompiler.py
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/pyt/jscompiler.py
rename to src/module_vmap/module/javascript/test/unit/pyt/jscompiler.py
diff --git a/vmap/client/modules/vmap/javascript/test/unit/pyt/jscompiler_test.py b/src/module_vmap/module/javascript/test/unit/pyt/jscompiler_test.py
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/pyt/jscompiler_test.py
rename to src/module_vmap/module/javascript/test/unit/pyt/jscompiler_test.py
diff --git a/vmap/client/modules/vmap/javascript/test/unit/pyt/source.py b/src/module_vmap/module/javascript/test/unit/pyt/source.py
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/pyt/source.py
rename to src/module_vmap/module/javascript/test/unit/pyt/source.py
diff --git a/vmap/client/modules/vmap/javascript/test/unit/pyt/source_test.py b/src/module_vmap/module/javascript/test/unit/pyt/source_test.py
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/pyt/source_test.py
rename to src/module_vmap/module/javascript/test/unit/pyt/source_test.py
diff --git a/vmap/client/modules/vmap/javascript/test/unit/pyt/treescan.py b/src/module_vmap/module/javascript/test/unit/pyt/treescan.py
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/pyt/treescan.py
rename to src/module_vmap/module/javascript/test/unit/pyt/treescan.py
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/Mock/CalcToStub.txt b/src/module_vmap/module/javascript/test/unit/resource/Mock/CalcToStub.txt
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/Mock/CalcToStub.txt
rename to src/module_vmap/module/javascript/test/unit/resource/Mock/CalcToStub.txt
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/Mock/MyMock.mock.js b/src/module_vmap/module/javascript/test/unit/resource/Mock/MyMock.mock.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/Mock/MyMock.mock.js
rename to src/module_vmap/module/javascript/test/unit/resource/Mock/MyMock.mock.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/Serveur_Geosignal.xml b/src/module_vmap/module/javascript/test/unit/resource/Serveur_Geosignal.xml
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/Serveur_Geosignal.xml
rename to src/module_vmap/module/javascript/test/unit/resource/Serveur_Geosignal.xml
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/a11y/aria/announcer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/a11y/aria/announcer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/a11y/aria/announcer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/a11y/aria/announcer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/a11y/aria/aria.js b/src/module_vmap/module/javascript/test/unit/resource/goog/a11y/aria/aria.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/a11y/aria/aria.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/a11y/aria/aria.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/a11y/aria/attributes.js b/src/module_vmap/module/javascript/test/unit/resource/goog/a11y/aria/attributes.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/a11y/aria/attributes.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/a11y/aria/attributes.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/a11y/aria/datatables.js b/src/module_vmap/module/javascript/test/unit/resource/goog/a11y/aria/datatables.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/a11y/aria/datatables.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/a11y/aria/datatables.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/a11y/aria/roles.js b/src/module_vmap/module/javascript/test/unit/resource/goog/a11y/aria/roles.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/a11y/aria/roles.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/a11y/aria/roles.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/array/array.js b/src/module_vmap/module/javascript/test/unit/resource/goog/array/array.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/array/array.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/array/array.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/asserts/asserts.js b/src/module_vmap/module/javascript/test/unit/resource/goog/asserts/asserts.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/asserts/asserts.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/asserts/asserts.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/async/animationdelay.js b/src/module_vmap/module/javascript/test/unit/resource/goog/async/animationdelay.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/async/animationdelay.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/async/animationdelay.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/async/conditionaldelay.js b/src/module_vmap/module/javascript/test/unit/resource/goog/async/conditionaldelay.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/async/conditionaldelay.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/async/conditionaldelay.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/async/delay.js b/src/module_vmap/module/javascript/test/unit/resource/goog/async/delay.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/async/delay.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/async/delay.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/async/freelist.js b/src/module_vmap/module/javascript/test/unit/resource/goog/async/freelist.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/async/freelist.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/async/freelist.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/async/nexttick.js b/src/module_vmap/module/javascript/test/unit/resource/goog/async/nexttick.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/async/nexttick.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/async/nexttick.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/async/run.js b/src/module_vmap/module/javascript/test/unit/resource/goog/async/run.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/async/run.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/async/run.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/async/run_test.js b/src/module_vmap/module/javascript/test/unit/resource/goog/async/run_test.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/async/run_test.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/async/run_test.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/async/throttle.js b/src/module_vmap/module/javascript/test/unit/resource/goog/async/throttle.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/async/throttle.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/async/throttle.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/async/workqueue.js b/src/module_vmap/module/javascript/test/unit/resource/goog/async/workqueue.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/async/workqueue.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/async/workqueue.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/base.js b/src/module_vmap/module/javascript/test/unit/resource/goog/base.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/base.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/base.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/bootstrap/nodejs.js b/src/module_vmap/module/javascript/test/unit/resource/goog/bootstrap/nodejs.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/bootstrap/nodejs.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/bootstrap/nodejs.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/bootstrap/webworkers.js b/src/module_vmap/module/javascript/test/unit/resource/goog/bootstrap/webworkers.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/bootstrap/webworkers.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/bootstrap/webworkers.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/color/alpha.js b/src/module_vmap/module/javascript/test/unit/resource/goog/color/alpha.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/color/alpha.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/color/alpha.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/color/color.js b/src/module_vmap/module/javascript/test/unit/resource/goog/color/color.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/color/color.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/color/color.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/color/names.js b/src/module_vmap/module/javascript/test/unit/resource/goog/color/names.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/color/names.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/color/names.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/crypt/aes.js b/src/module_vmap/module/javascript/test/unit/resource/goog/crypt/aes.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/crypt/aes.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/crypt/aes.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/crypt/arc4.js b/src/module_vmap/module/javascript/test/unit/resource/goog/crypt/arc4.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/crypt/arc4.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/crypt/arc4.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/crypt/base64.js b/src/module_vmap/module/javascript/test/unit/resource/goog/crypt/base64.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/crypt/base64.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/crypt/base64.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/crypt/basen.js b/src/module_vmap/module/javascript/test/unit/resource/goog/crypt/basen.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/crypt/basen.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/crypt/basen.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/crypt/blobhasher.js b/src/module_vmap/module/javascript/test/unit/resource/goog/crypt/blobhasher.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/crypt/blobhasher.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/crypt/blobhasher.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/crypt/blockcipher.js b/src/module_vmap/module/javascript/test/unit/resource/goog/crypt/blockcipher.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/crypt/blockcipher.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/crypt/blockcipher.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/crypt/cbc.js b/src/module_vmap/module/javascript/test/unit/resource/goog/crypt/cbc.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/crypt/cbc.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/crypt/cbc.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/crypt/crypt.js b/src/module_vmap/module/javascript/test/unit/resource/goog/crypt/crypt.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/crypt/crypt.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/crypt/crypt.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/crypt/hash.js b/src/module_vmap/module/javascript/test/unit/resource/goog/crypt/hash.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/crypt/hash.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/crypt/hash.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/crypt/hash32.js b/src/module_vmap/module/javascript/test/unit/resource/goog/crypt/hash32.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/crypt/hash32.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/crypt/hash32.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/crypt/hashtester.js b/src/module_vmap/module/javascript/test/unit/resource/goog/crypt/hashtester.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/crypt/hashtester.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/crypt/hashtester.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/crypt/hmac.js b/src/module_vmap/module/javascript/test/unit/resource/goog/crypt/hmac.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/crypt/hmac.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/crypt/hmac.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/crypt/md5.js b/src/module_vmap/module/javascript/test/unit/resource/goog/crypt/md5.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/crypt/md5.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/crypt/md5.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/crypt/pbkdf2.js b/src/module_vmap/module/javascript/test/unit/resource/goog/crypt/pbkdf2.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/crypt/pbkdf2.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/crypt/pbkdf2.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/crypt/sha1.js b/src/module_vmap/module/javascript/test/unit/resource/goog/crypt/sha1.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/crypt/sha1.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/crypt/sha1.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/crypt/sha1_test.js b/src/module_vmap/module/javascript/test/unit/resource/goog/crypt/sha1_test.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/crypt/sha1_test.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/crypt/sha1_test.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/crypt/sha2.js b/src/module_vmap/module/javascript/test/unit/resource/goog/crypt/sha2.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/crypt/sha2.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/crypt/sha2.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/crypt/sha224.js b/src/module_vmap/module/javascript/test/unit/resource/goog/crypt/sha224.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/crypt/sha224.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/crypt/sha224.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/crypt/sha256.js b/src/module_vmap/module/javascript/test/unit/resource/goog/crypt/sha256.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/crypt/sha256.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/crypt/sha256.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/crypt/sha2_64bit.js b/src/module_vmap/module/javascript/test/unit/resource/goog/crypt/sha2_64bit.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/crypt/sha2_64bit.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/crypt/sha2_64bit.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/crypt/sha384.js b/src/module_vmap/module/javascript/test/unit/resource/goog/crypt/sha384.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/crypt/sha384.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/crypt/sha384.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/crypt/sha512.js b/src/module_vmap/module/javascript/test/unit/resource/goog/crypt/sha512.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/crypt/sha512.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/crypt/sha512.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/crypt/sha512_256.js b/src/module_vmap/module/javascript/test/unit/resource/goog/crypt/sha512_256.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/crypt/sha512_256.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/crypt/sha512_256.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/autocomplete.css b/src/module_vmap/module/javascript/test/unit/resource/goog/css/autocomplete.css
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/autocomplete.css
rename to src/module_vmap/module/javascript/test/unit/resource/goog/css/autocomplete.css
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/bubble.css b/src/module_vmap/module/javascript/test/unit/resource/goog/css/bubble.css
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/bubble.css
rename to src/module_vmap/module/javascript/test/unit/resource/goog/css/bubble.css
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/button.css b/src/module_vmap/module/javascript/test/unit/resource/goog/css/button.css
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/button.css
rename to src/module_vmap/module/javascript/test/unit/resource/goog/css/button.css
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/charpicker.css b/src/module_vmap/module/javascript/test/unit/resource/goog/css/charpicker.css
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/charpicker.css
rename to src/module_vmap/module/javascript/test/unit/resource/goog/css/charpicker.css
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/checkbox.css b/src/module_vmap/module/javascript/test/unit/resource/goog/css/checkbox.css
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/checkbox.css
rename to src/module_vmap/module/javascript/test/unit/resource/goog/css/checkbox.css
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/colormenubutton.css b/src/module_vmap/module/javascript/test/unit/resource/goog/css/colormenubutton.css
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/colormenubutton.css
rename to src/module_vmap/module/javascript/test/unit/resource/goog/css/colormenubutton.css
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/colorpalette.css b/src/module_vmap/module/javascript/test/unit/resource/goog/css/colorpalette.css
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/colorpalette.css
rename to src/module_vmap/module/javascript/test/unit/resource/goog/css/colorpalette.css
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/colorpicker-simplegrid.css b/src/module_vmap/module/javascript/test/unit/resource/goog/css/colorpicker-simplegrid.css
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/colorpicker-simplegrid.css
rename to src/module_vmap/module/javascript/test/unit/resource/goog/css/colorpicker-simplegrid.css
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/combobox.css b/src/module_vmap/module/javascript/test/unit/resource/goog/css/combobox.css
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/combobox.css
rename to src/module_vmap/module/javascript/test/unit/resource/goog/css/combobox.css
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/common.css b/src/module_vmap/module/javascript/test/unit/resource/goog/css/common.css
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/common.css
rename to src/module_vmap/module/javascript/test/unit/resource/goog/css/common.css
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/css3button.css b/src/module_vmap/module/javascript/test/unit/resource/goog/css/css3button.css
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/css3button.css
rename to src/module_vmap/module/javascript/test/unit/resource/goog/css/css3button.css
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/css3menubutton.css b/src/module_vmap/module/javascript/test/unit/resource/goog/css/css3menubutton.css
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/css3menubutton.css
rename to src/module_vmap/module/javascript/test/unit/resource/goog/css/css3menubutton.css
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/custombutton.css b/src/module_vmap/module/javascript/test/unit/resource/goog/css/custombutton.css
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/custombutton.css
rename to src/module_vmap/module/javascript/test/unit/resource/goog/css/custombutton.css
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/datepicker.css b/src/module_vmap/module/javascript/test/unit/resource/goog/css/datepicker.css
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/datepicker.css
rename to src/module_vmap/module/javascript/test/unit/resource/goog/css/datepicker.css
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/dialog.css b/src/module_vmap/module/javascript/test/unit/resource/goog/css/dialog.css
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/dialog.css
rename to src/module_vmap/module/javascript/test/unit/resource/goog/css/dialog.css
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/dimensionpicker.css b/src/module_vmap/module/javascript/test/unit/resource/goog/css/dimensionpicker.css
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/dimensionpicker.css
rename to src/module_vmap/module/javascript/test/unit/resource/goog/css/dimensionpicker.css
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/dragdropdetector.css b/src/module_vmap/module/javascript/test/unit/resource/goog/css/dragdropdetector.css
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/dragdropdetector.css
rename to src/module_vmap/module/javascript/test/unit/resource/goog/css/dragdropdetector.css
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/editor/bubble.css b/src/module_vmap/module/javascript/test/unit/resource/goog/css/editor/bubble.css
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/editor/bubble.css
rename to src/module_vmap/module/javascript/test/unit/resource/goog/css/editor/bubble.css
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/editor/dialog.css b/src/module_vmap/module/javascript/test/unit/resource/goog/css/editor/dialog.css
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/editor/dialog.css
rename to src/module_vmap/module/javascript/test/unit/resource/goog/css/editor/dialog.css
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/editor/equationeditor.css b/src/module_vmap/module/javascript/test/unit/resource/goog/css/editor/equationeditor.css
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/editor/equationeditor.css
rename to src/module_vmap/module/javascript/test/unit/resource/goog/css/editor/equationeditor.css
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/editor/linkdialog.css b/src/module_vmap/module/javascript/test/unit/resource/goog/css/editor/linkdialog.css
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/editor/linkdialog.css
rename to src/module_vmap/module/javascript/test/unit/resource/goog/css/editor/linkdialog.css
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/editortoolbar.css b/src/module_vmap/module/javascript/test/unit/resource/goog/css/editortoolbar.css
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/editortoolbar.css
rename to src/module_vmap/module/javascript/test/unit/resource/goog/css/editortoolbar.css
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/filteredmenu.css b/src/module_vmap/module/javascript/test/unit/resource/goog/css/filteredmenu.css
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/filteredmenu.css
rename to src/module_vmap/module/javascript/test/unit/resource/goog/css/filteredmenu.css
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/filterobservingmenuitem.css b/src/module_vmap/module/javascript/test/unit/resource/goog/css/filterobservingmenuitem.css
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/filterobservingmenuitem.css
rename to src/module_vmap/module/javascript/test/unit/resource/goog/css/filterobservingmenuitem.css
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/flatbutton.css b/src/module_vmap/module/javascript/test/unit/resource/goog/css/flatbutton.css
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/flatbutton.css
rename to src/module_vmap/module/javascript/test/unit/resource/goog/css/flatbutton.css
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/flatmenubutton.css b/src/module_vmap/module/javascript/test/unit/resource/goog/css/flatmenubutton.css
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/flatmenubutton.css
rename to src/module_vmap/module/javascript/test/unit/resource/goog/css/flatmenubutton.css
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/hovercard.css b/src/module_vmap/module/javascript/test/unit/resource/goog/css/hovercard.css
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/hovercard.css
rename to src/module_vmap/module/javascript/test/unit/resource/goog/css/hovercard.css
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/hsvapalette.css b/src/module_vmap/module/javascript/test/unit/resource/goog/css/hsvapalette.css
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/hsvapalette.css
rename to src/module_vmap/module/javascript/test/unit/resource/goog/css/hsvapalette.css
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/hsvpalette.css b/src/module_vmap/module/javascript/test/unit/resource/goog/css/hsvpalette.css
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/hsvpalette.css
rename to src/module_vmap/module/javascript/test/unit/resource/goog/css/hsvpalette.css
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/imagelessbutton.css b/src/module_vmap/module/javascript/test/unit/resource/goog/css/imagelessbutton.css
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/imagelessbutton.css
rename to src/module_vmap/module/javascript/test/unit/resource/goog/css/imagelessbutton.css
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/imagelessmenubutton.css b/src/module_vmap/module/javascript/test/unit/resource/goog/css/imagelessmenubutton.css
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/imagelessmenubutton.css
rename to src/module_vmap/module/javascript/test/unit/resource/goog/css/imagelessmenubutton.css
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/inputdatepicker.css b/src/module_vmap/module/javascript/test/unit/resource/goog/css/inputdatepicker.css
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/inputdatepicker.css
rename to src/module_vmap/module/javascript/test/unit/resource/goog/css/inputdatepicker.css
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/linkbutton.css b/src/module_vmap/module/javascript/test/unit/resource/goog/css/linkbutton.css
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/linkbutton.css
rename to src/module_vmap/module/javascript/test/unit/resource/goog/css/linkbutton.css
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/menu.css b/src/module_vmap/module/javascript/test/unit/resource/goog/css/menu.css
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/menu.css
rename to src/module_vmap/module/javascript/test/unit/resource/goog/css/menu.css
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/menubar.css b/src/module_vmap/module/javascript/test/unit/resource/goog/css/menubar.css
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/menubar.css
rename to src/module_vmap/module/javascript/test/unit/resource/goog/css/menubar.css
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/menubutton.css b/src/module_vmap/module/javascript/test/unit/resource/goog/css/menubutton.css
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/menubutton.css
rename to src/module_vmap/module/javascript/test/unit/resource/goog/css/menubutton.css
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/menuitem.css b/src/module_vmap/module/javascript/test/unit/resource/goog/css/menuitem.css
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/menuitem.css
rename to src/module_vmap/module/javascript/test/unit/resource/goog/css/menuitem.css
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/menuseparator.css b/src/module_vmap/module/javascript/test/unit/resource/goog/css/menuseparator.css
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/menuseparator.css
rename to src/module_vmap/module/javascript/test/unit/resource/goog/css/menuseparator.css
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/multitestrunner.css b/src/module_vmap/module/javascript/test/unit/resource/goog/css/multitestrunner.css
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/multitestrunner.css
rename to src/module_vmap/module/javascript/test/unit/resource/goog/css/multitestrunner.css
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/palette.css b/src/module_vmap/module/javascript/test/unit/resource/goog/css/palette.css
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/palette.css
rename to src/module_vmap/module/javascript/test/unit/resource/goog/css/palette.css
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/popupdatepicker.css b/src/module_vmap/module/javascript/test/unit/resource/goog/css/popupdatepicker.css
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/popupdatepicker.css
rename to src/module_vmap/module/javascript/test/unit/resource/goog/css/popupdatepicker.css
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/roundedpanel.css b/src/module_vmap/module/javascript/test/unit/resource/goog/css/roundedpanel.css
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/roundedpanel.css
rename to src/module_vmap/module/javascript/test/unit/resource/goog/css/roundedpanel.css
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/roundedtab.css b/src/module_vmap/module/javascript/test/unit/resource/goog/css/roundedtab.css
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/roundedtab.css
rename to src/module_vmap/module/javascript/test/unit/resource/goog/css/roundedtab.css
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/submenu.css b/src/module_vmap/module/javascript/test/unit/resource/goog/css/submenu.css
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/submenu.css
rename to src/module_vmap/module/javascript/test/unit/resource/goog/css/submenu.css
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/tab.css b/src/module_vmap/module/javascript/test/unit/resource/goog/css/tab.css
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/tab.css
rename to src/module_vmap/module/javascript/test/unit/resource/goog/css/tab.css
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/tabbar.css b/src/module_vmap/module/javascript/test/unit/resource/goog/css/tabbar.css
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/tabbar.css
rename to src/module_vmap/module/javascript/test/unit/resource/goog/css/tabbar.css
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/tablesorter.css b/src/module_vmap/module/javascript/test/unit/resource/goog/css/tablesorter.css
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/tablesorter.css
rename to src/module_vmap/module/javascript/test/unit/resource/goog/css/tablesorter.css
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/toolbar.css b/src/module_vmap/module/javascript/test/unit/resource/goog/css/toolbar.css
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/toolbar.css
rename to src/module_vmap/module/javascript/test/unit/resource/goog/css/toolbar.css
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/tooltip.css b/src/module_vmap/module/javascript/test/unit/resource/goog/css/tooltip.css
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/tooltip.css
rename to src/module_vmap/module/javascript/test/unit/resource/goog/css/tooltip.css
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/tree.css b/src/module_vmap/module/javascript/test/unit/resource/goog/css/tree.css
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/tree.css
rename to src/module_vmap/module/javascript/test/unit/resource/goog/css/tree.css
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/tristatemenuitem.css b/src/module_vmap/module/javascript/test/unit/resource/goog/css/tristatemenuitem.css
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/css/tristatemenuitem.css
rename to src/module_vmap/module/javascript/test/unit/resource/goog/css/tristatemenuitem.css
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/cssom/cssom.js b/src/module_vmap/module/javascript/test/unit/resource/goog/cssom/cssom.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/cssom/cssom.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/cssom/cssom.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/cssom/cssom_test_import_1.css b/src/module_vmap/module/javascript/test/unit/resource/goog/cssom/cssom_test_import_1.css
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/cssom/cssom_test_import_1.css
rename to src/module_vmap/module/javascript/test/unit/resource/goog/cssom/cssom_test_import_1.css
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/cssom/cssom_test_import_2.css b/src/module_vmap/module/javascript/test/unit/resource/goog/cssom/cssom_test_import_2.css
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/cssom/cssom_test_import_2.css
rename to src/module_vmap/module/javascript/test/unit/resource/goog/cssom/cssom_test_import_2.css
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/cssom/cssom_test_link_1.css b/src/module_vmap/module/javascript/test/unit/resource/goog/cssom/cssom_test_link_1.css
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/cssom/cssom_test_link_1.css
rename to src/module_vmap/module/javascript/test/unit/resource/goog/cssom/cssom_test_link_1.css
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/cssom/iframe/style.js b/src/module_vmap/module/javascript/test/unit/resource/goog/cssom/iframe/style.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/cssom/iframe/style.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/cssom/iframe/style.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/cssom/iframe/style_test_import.css b/src/module_vmap/module/javascript/test/unit/resource/goog/cssom/iframe/style_test_import.css
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/cssom/iframe/style_test_import.css
rename to src/module_vmap/module/javascript/test/unit/resource/goog/cssom/iframe/style_test_import.css
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/datasource/datamanager.js b/src/module_vmap/module/javascript/test/unit/resource/goog/datasource/datamanager.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/datasource/datamanager.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/datasource/datamanager.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/datasource/datasource.js b/src/module_vmap/module/javascript/test/unit/resource/goog/datasource/datasource.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/datasource/datasource.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/datasource/datasource.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/datasource/expr.js b/src/module_vmap/module/javascript/test/unit/resource/goog/datasource/expr.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/datasource/expr.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/datasource/expr.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/datasource/fastdatanode.js b/src/module_vmap/module/javascript/test/unit/resource/goog/datasource/fastdatanode.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/datasource/fastdatanode.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/datasource/fastdatanode.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/datasource/jsdatasource.js b/src/module_vmap/module/javascript/test/unit/resource/goog/datasource/jsdatasource.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/datasource/jsdatasource.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/datasource/jsdatasource.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/datasource/jsondatasource.js b/src/module_vmap/module/javascript/test/unit/resource/goog/datasource/jsondatasource.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/datasource/jsondatasource.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/datasource/jsondatasource.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/datasource/jsxmlhttpdatasource.js b/src/module_vmap/module/javascript/test/unit/resource/goog/datasource/jsxmlhttpdatasource.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/datasource/jsxmlhttpdatasource.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/datasource/jsxmlhttpdatasource.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/datasource/xmldatasource.js b/src/module_vmap/module/javascript/test/unit/resource/goog/datasource/xmldatasource.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/datasource/xmldatasource.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/datasource/xmldatasource.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/date/date.js b/src/module_vmap/module/javascript/test/unit/resource/goog/date/date.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/date/date.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/date/date.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/date/datelike.js b/src/module_vmap/module/javascript/test/unit/resource/goog/date/datelike.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/date/datelike.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/date/datelike.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/date/daterange.js b/src/module_vmap/module/javascript/test/unit/resource/goog/date/daterange.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/date/daterange.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/date/daterange.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/date/duration.js b/src/module_vmap/module/javascript/test/unit/resource/goog/date/duration.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/date/duration.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/date/duration.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/date/relative.js b/src/module_vmap/module/javascript/test/unit/resource/goog/date/relative.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/date/relative.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/date/relative.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/date/relativewithplurals.js b/src/module_vmap/module/javascript/test/unit/resource/goog/date/relativewithplurals.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/date/relativewithplurals.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/date/relativewithplurals.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/date/utcdatetime.js b/src/module_vmap/module/javascript/test/unit/resource/goog/date/utcdatetime.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/date/utcdatetime.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/date/utcdatetime.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/db/cursor.js b/src/module_vmap/module/javascript/test/unit/resource/goog/db/cursor.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/db/cursor.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/db/cursor.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/db/db.js b/src/module_vmap/module/javascript/test/unit/resource/goog/db/db.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/db/db.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/db/db.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/db/error.js b/src/module_vmap/module/javascript/test/unit/resource/goog/db/error.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/db/error.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/db/error.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/db/index.js b/src/module_vmap/module/javascript/test/unit/resource/goog/db/index.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/db/index.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/db/index.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/db/indexeddb.js b/src/module_vmap/module/javascript/test/unit/resource/goog/db/indexeddb.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/db/indexeddb.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/db/indexeddb.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/db/keyrange.js b/src/module_vmap/module/javascript/test/unit/resource/goog/db/keyrange.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/db/keyrange.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/db/keyrange.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/db/objectstore.js b/src/module_vmap/module/javascript/test/unit/resource/goog/db/objectstore.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/db/objectstore.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/db/objectstore.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/db/transaction.js b/src/module_vmap/module/javascript/test/unit/resource/goog/db/transaction.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/db/transaction.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/db/transaction.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/debug/console.js b/src/module_vmap/module/javascript/test/unit/resource/goog/debug/console.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/debug/console.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/debug/console.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/debug/debug.js b/src/module_vmap/module/javascript/test/unit/resource/goog/debug/debug.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/debug/debug.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/debug/debug.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/debug/debugwindow.js b/src/module_vmap/module/javascript/test/unit/resource/goog/debug/debugwindow.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/debug/debugwindow.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/debug/debugwindow.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/debug/devcss/devcss.js b/src/module_vmap/module/javascript/test/unit/resource/goog/debug/devcss/devcss.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/debug/devcss/devcss.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/debug/devcss/devcss.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/debug/devcss/devcssrunner.js b/src/module_vmap/module/javascript/test/unit/resource/goog/debug/devcss/devcssrunner.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/debug/devcss/devcssrunner.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/debug/devcss/devcssrunner.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/debug/divconsole.js b/src/module_vmap/module/javascript/test/unit/resource/goog/debug/divconsole.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/debug/divconsole.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/debug/divconsole.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/debug/entrypointregistry.js b/src/module_vmap/module/javascript/test/unit/resource/goog/debug/entrypointregistry.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/debug/entrypointregistry.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/debug/entrypointregistry.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/debug/error.js b/src/module_vmap/module/javascript/test/unit/resource/goog/debug/error.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/debug/error.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/debug/error.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/debug/errorhandler.js b/src/module_vmap/module/javascript/test/unit/resource/goog/debug/errorhandler.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/debug/errorhandler.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/debug/errorhandler.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/debug/errorhandlerweakdep.js b/src/module_vmap/module/javascript/test/unit/resource/goog/debug/errorhandlerweakdep.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/debug/errorhandlerweakdep.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/debug/errorhandlerweakdep.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/debug/errorreporter.js b/src/module_vmap/module/javascript/test/unit/resource/goog/debug/errorreporter.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/debug/errorreporter.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/debug/errorreporter.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/debug/fancywindow.js b/src/module_vmap/module/javascript/test/unit/resource/goog/debug/fancywindow.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/debug/fancywindow.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/debug/fancywindow.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/debug/formatter.js b/src/module_vmap/module/javascript/test/unit/resource/goog/debug/formatter.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/debug/formatter.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/debug/formatter.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/debug/fpsdisplay.js b/src/module_vmap/module/javascript/test/unit/resource/goog/debug/fpsdisplay.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/debug/fpsdisplay.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/debug/fpsdisplay.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/debug/gcdiagnostics.js b/src/module_vmap/module/javascript/test/unit/resource/goog/debug/gcdiagnostics.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/debug/gcdiagnostics.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/debug/gcdiagnostics.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/debug/logbuffer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/debug/logbuffer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/debug/logbuffer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/debug/logbuffer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/debug/logger.js b/src/module_vmap/module/javascript/test/unit/resource/goog/debug/logger.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/debug/logger.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/debug/logger.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/debug/logrecord.js b/src/module_vmap/module/javascript/test/unit/resource/goog/debug/logrecord.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/debug/logrecord.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/debug/logrecord.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/debug/logrecordserializer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/debug/logrecordserializer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/debug/logrecordserializer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/debug/logrecordserializer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/debug/relativetimeprovider.js b/src/module_vmap/module/javascript/test/unit/resource/goog/debug/relativetimeprovider.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/debug/relativetimeprovider.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/debug/relativetimeprovider.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/debug/tracer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/debug/tracer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/debug/tracer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/debug/tracer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/advancedtooltip.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/advancedtooltip.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/advancedtooltip.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/advancedtooltip.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/animationqueue.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/animationqueue.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/animationqueue.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/animationqueue.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/autocomplete-basic.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/autocomplete-basic.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/autocomplete-basic.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/autocomplete-basic.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/autocompleteremote.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/autocompleteremote.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/autocompleteremote.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/autocompleteremote.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/autocompleteremotedata.js b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/autocompleteremotedata.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/autocompleteremotedata.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/autocompleteremotedata.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/autocompleterichremote.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/autocompleterichremote.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/autocompleterichremote.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/autocompleterichremote.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/autocompleterichremotedata.js b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/autocompleterichremotedata.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/autocompleterichremotedata.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/autocompleterichremotedata.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/bidiinput.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/bidiinput.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/bidiinput.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/bidiinput.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/blobhasher.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/blobhasher.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/blobhasher.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/blobhasher.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/bubble.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/bubble.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/bubble.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/bubble.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/button.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/button.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/button.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/button.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/charcounter.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/charcounter.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/charcounter.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/charcounter.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/charpicker.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/charpicker.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/charpicker.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/charpicker.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/checkbox.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/checkbox.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/checkbox.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/checkbox.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/color-contrast.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/color-contrast.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/color-contrast.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/color-contrast.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/colormenubutton.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/colormenubutton.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/colormenubutton.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/colormenubutton.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/colorpicker.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/colorpicker.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/colorpicker.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/colorpicker.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/combobox.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/combobox.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/combobox.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/combobox.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/container.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/container.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/container.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/container.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/control.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/control.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/control.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/control.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/css/demo.css b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/css/demo.css
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/css/demo.css
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/css/demo.css
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/css/emojipicker.css b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/css/emojipicker.css
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/css/emojipicker.css
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/css/emojipicker.css
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/css/emojisprite.css b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/css/emojisprite.css
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/css/emojisprite.css
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/css/emojisprite.css
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/css3button.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/css3button.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/css3button.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/css3button.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/css3menubutton.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/css3menubutton.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/css3menubutton.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/css3menubutton.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/cssspriteanimation.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/cssspriteanimation.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/cssspriteanimation.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/cssspriteanimation.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/datepicker.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/datepicker.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/datepicker.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/datepicker.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/debug.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/debug.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/debug.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/debug.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/depsgraph.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/depsgraph.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/depsgraph.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/depsgraph.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/dialog.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/dialog.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/dialog.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/dialog.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/dimensionpicker.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/dimensionpicker.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/dimensionpicker.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/dimensionpicker.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/dimensionpicker_rtl.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/dimensionpicker_rtl.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/dimensionpicker_rtl.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/dimensionpicker_rtl.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/dom_selection.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/dom_selection.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/dom_selection.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/dom_selection.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/drag.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/drag.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/drag.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/drag.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/dragdrop.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/dragdrop.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/dragdrop.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/dragdrop.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/dragdropdetector.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/dragdropdetector.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/dragdropdetector.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/dragdropdetector.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/dragdropdetector_target.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/dragdropdetector_target.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/dragdropdetector_target.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/dragdropdetector_target.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/dragger.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/dragger.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/dragger.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/dragger.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/draglistgroup.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/draglistgroup.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/draglistgroup.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/draglistgroup.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/dragscrollsupport.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/dragscrollsupport.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/dragscrollsupport.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/dragscrollsupport.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/drilldownrow.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/drilldownrow.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/drilldownrow.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/drilldownrow.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/editor/deps.js b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/editor/deps.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/editor/deps.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/editor/deps.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/editor/editor.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/editor/editor.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/editor/editor.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/editor/editor.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/editor/field_basic.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/editor/field_basic.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/editor/field_basic.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/editor/field_basic.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/editor/helloworld.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/editor/helloworld.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/editor/helloworld.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/editor/helloworld.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/editor/helloworld.js b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/editor/helloworld.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/editor/helloworld.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/editor/helloworld.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/editor/helloworld_test.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/editor/helloworld_test.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/editor/helloworld_test.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/editor/helloworld_test.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/editor/helloworlddialog.js b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/editor/helloworlddialog.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/editor/helloworlddialog.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/editor/helloworlddialog.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/editor/helloworlddialog_test.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/editor/helloworlddialog_test.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/editor/helloworlddialog_test.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/editor/helloworlddialog_test.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/editor/helloworlddialogplugin.js b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/editor/helloworlddialogplugin.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/editor/helloworlddialogplugin.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/editor/helloworlddialogplugin.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/editor/helloworlddialogplugin_test.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/editor/helloworlddialogplugin_test.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/editor/helloworlddialogplugin_test.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/editor/helloworlddialogplugin_test.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/editor/seamlessfield.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/editor/seamlessfield.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/editor/seamlessfield.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/editor/seamlessfield.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/editor/tableeditor.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/editor/tableeditor.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/editor/tableeditor.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/editor/tableeditor.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/effects.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/effects.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/effects.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/effects.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/200.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/200.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/200.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/200.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/201.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/201.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/201.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/201.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/202.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/202.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/202.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/202.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/203.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/203.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/203.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/203.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/204.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/204.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/204.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/204.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/205.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/205.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/205.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/205.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/206.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/206.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/206.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/206.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2BC.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2BC.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2BC.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2BC.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2BD.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2BD.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2BD.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2BD.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2BE.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2BE.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2BE.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2BE.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2BF.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2BF.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2BF.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2BF.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2C0.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2C0.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2C0.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2C0.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2C1.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2C1.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2C1.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2C1.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2C2.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2C2.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2C2.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2C2.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2C3.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2C3.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2C3.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2C3.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2C4.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2C4.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2C4.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2C4.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2C5.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2C5.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2C5.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2C5.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2C6.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2C6.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2C6.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2C6.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2C7.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2C7.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2C7.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2C7.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2C8.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2C8.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2C8.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2C8.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2C9.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2C9.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2C9.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2C9.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2CA.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2CA.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2CA.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2CA.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2CB.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2CB.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2CB.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2CB.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2CC.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2CC.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2CC.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2CC.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2CD.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2CD.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2CD.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2CD.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2CE.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2CE.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2CE.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2CE.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2CF.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2CF.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2CF.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2CF.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2D0.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2D0.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2D0.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2D0.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2D1.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2D1.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2D1.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2D1.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2D2.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2D2.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2D2.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2D2.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2D3.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2D3.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2D3.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2D3.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2D4.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2D4.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2D4.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2D4.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2D5.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2D5.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2D5.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2D5.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2D6.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2D6.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2D6.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2D6.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2D7.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2D7.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2D7.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2D7.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2D8.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2D8.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2D8.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2D8.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2D9.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2D9.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2D9.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2D9.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2DA.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2DA.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2DA.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2DA.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2DB.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2DB.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2DB.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2DB.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2DC.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2DC.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2DC.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2DC.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2DD.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2DD.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2DD.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2DD.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2DE.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2DE.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2DE.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2DE.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2DF.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2DF.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2DF.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2DF.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2E0.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2E0.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2E0.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2E0.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2E1.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2E1.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2E1.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2E1.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2E2.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2E2.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2E2.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2E2.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2E3.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2E3.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2E3.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2E3.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2E4.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2E4.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2E4.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2E4.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2E5.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2E5.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2E5.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2E5.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2E6.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2E6.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2E6.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2E6.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2E7.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2E7.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2E7.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2E7.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2E8.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2E8.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2E8.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2E8.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2E9.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2E9.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2E9.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2E9.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2EA.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2EA.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2EA.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2EA.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2EB.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2EB.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2EB.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2EB.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2EC.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2EC.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2EC.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2EC.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2ED.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2ED.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2ED.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2ED.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2EE.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2EE.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2EE.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2EE.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2EF.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2EF.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2EF.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2EF.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2F0.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2F0.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2F0.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2F0.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2F1.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2F1.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2F1.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2F1.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2F2.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2F2.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2F2.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2F2.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2F3.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2F3.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2F3.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2F3.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2F4.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2F4.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2F4.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2F4.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2F5.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2F5.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2F5.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2F5.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2F6.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2F6.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2F6.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2F6.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2F7.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2F7.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2F7.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2F7.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2F8.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2F8.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2F8.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2F8.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2F9.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2F9.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2F9.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2F9.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2FA.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2FA.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2FA.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2FA.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2FB.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2FB.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2FB.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2FB.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2FC.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2FC.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2FC.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2FC.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2FD.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2FD.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2FD.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2FD.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2FE.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2FE.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2FE.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2FE.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2FF.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2FF.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/2FF.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/2FF.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/none.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/none.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/none.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/none.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/sprite.png b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/sprite.png
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/sprite.png
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/sprite.png
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/sprite2.png b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/sprite2.png
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/sprite2.png
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/sprite2.png
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/unknown.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/unknown.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/emoji/unknown.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/emoji/unknown.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/event-propagation.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/event-propagation.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/event-propagation.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/event-propagation.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/events.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/events.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/events.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/events.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/eventtarget.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/eventtarget.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/eventtarget.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/eventtarget.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/filedrophandler.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/filedrophandler.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/filedrophandler.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/filedrophandler.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/filteredmenu.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/filteredmenu.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/filteredmenu.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/filteredmenu.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/focushandler.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/focushandler.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/focushandler.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/focushandler.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/fpsdisplay.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/fpsdisplay.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/fpsdisplay.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/fpsdisplay.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/fx/css3/transition.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/fx/css3/transition.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/fx/css3/transition.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/fx/css3/transition.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/gauge.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/gauge.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/gauge.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/gauge.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/graphics/advancedcoordinates.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/graphics/advancedcoordinates.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/graphics/advancedcoordinates.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/graphics/advancedcoordinates.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/graphics/advancedcoordinates2.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/graphics/advancedcoordinates2.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/graphics/advancedcoordinates2.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/graphics/advancedcoordinates2.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/graphics/basicelements.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/graphics/basicelements.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/graphics/basicelements.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/graphics/basicelements.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/graphics/events.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/graphics/events.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/graphics/events.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/graphics/events.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/graphics/modifyelements.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/graphics/modifyelements.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/graphics/modifyelements.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/graphics/modifyelements.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/graphics/subpixel.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/graphics/subpixel.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/graphics/subpixel.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/graphics/subpixel.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/graphics/tiger.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/graphics/tiger.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/graphics/tiger.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/graphics/tiger.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/graphics/tigerdata.js b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/graphics/tigerdata.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/graphics/tigerdata.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/graphics/tigerdata.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/history1.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/history1.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/history1.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/history1.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/history2.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/history2.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/history2.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/history2.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/history3.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/history3.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/history3.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/history3.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/history3js.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/history3js.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/history3js.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/history3js.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/history_blank.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/history_blank.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/history_blank.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/history_blank.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/hovercard.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/hovercard.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/hovercard.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/hovercard.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/hsvapalette.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/hsvapalette.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/hsvapalette.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/hsvapalette.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/hsvpalette.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/hsvpalette.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/hsvpalette.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/hsvpalette.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/html5history.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/html5history.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/html5history.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/html5history.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/imagelessbutton.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/imagelessbutton.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/imagelessbutton.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/imagelessbutton.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/imagelessmenubutton.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/imagelessmenubutton.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/imagelessmenubutton.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/imagelessmenubutton.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/index.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/index.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/index.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/index.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/index_nav.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/index_nav.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/index_nav.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/index_nav.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/index_splash.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/index_splash.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/index_splash.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/index_splash.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/inline_block_quirks.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/inline_block_quirks.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/inline_block_quirks.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/inline_block_quirks.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/inline_block_standards.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/inline_block_standards.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/inline_block_standards.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/inline_block_standards.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/inputdatepicker.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/inputdatepicker.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/inputdatepicker.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/inputdatepicker.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/inputhandler.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/inputhandler.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/inputhandler.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/inputhandler.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/jsonprettyprinter.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/jsonprettyprinter.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/jsonprettyprinter.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/jsonprettyprinter.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/keyboardshortcuts.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/keyboardshortcuts.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/keyboardshortcuts.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/keyboardshortcuts.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/keyhandler.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/keyhandler.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/keyhandler.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/keyhandler.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/labelinput.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/labelinput.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/labelinput.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/labelinput.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/menu.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/menu.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/menu.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/menu.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/menubar.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/menubar.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/menubar.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/menubar.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/menubutton.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/menubutton.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/menubutton.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/menubutton.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/menubutton_frame.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/menubutton_frame.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/menubutton_frame.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/menubutton_frame.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/menuitem.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/menuitem.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/menuitem.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/menuitem.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/mousewheelhandler.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/mousewheelhandler.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/mousewheelhandler.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/mousewheelhandler.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/onlinehandler.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/onlinehandler.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/onlinehandler.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/onlinehandler.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/palette.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/palette.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/palette.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/palette.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/pastehandler.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/pastehandler.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/pastehandler.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/pastehandler.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/pixeldensitymonitor.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/pixeldensitymonitor.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/pixeldensitymonitor.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/pixeldensitymonitor.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/plaintextspellchecker.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/plaintextspellchecker.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/plaintextspellchecker.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/plaintextspellchecker.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/popup.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/popup.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/popup.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/popup.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/popupcolorpicker.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/popupcolorpicker.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/popupcolorpicker.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/popupcolorpicker.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/popupdatepicker.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/popupdatepicker.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/popupdatepicker.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/popupdatepicker.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/popupemojipicker.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/popupemojipicker.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/popupemojipicker.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/popupemojipicker.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/popupmenu.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/popupmenu.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/popupmenu.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/popupmenu.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/progressbar.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/progressbar.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/progressbar.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/progressbar.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/prompt.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/prompt.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/prompt.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/prompt.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/quadtree.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/quadtree.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/quadtree.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/quadtree.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/ratings.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/ratings.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/ratings.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/ratings.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/richtextspellchecker.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/richtextspellchecker.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/richtextspellchecker.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/richtextspellchecker.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/roundedpanel.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/roundedpanel.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/roundedpanel.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/roundedpanel.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/samplecomponent.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/samplecomponent.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/samplecomponent.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/samplecomponent.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/samplecomponent.js b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/samplecomponent.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/samplecomponent.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/samplecomponent.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/scrollfloater.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/scrollfloater.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/scrollfloater.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/scrollfloater.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/select.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/select.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/select.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/select.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/selectionmenubutton.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/selectionmenubutton.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/selectionmenubutton.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/selectionmenubutton.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/serverchart.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/serverchart.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/serverchart.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/serverchart.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/slider.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/slider.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/slider.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/slider.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/splitbehavior.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/splitbehavior.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/splitbehavior.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/splitbehavior.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/splitpane.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/splitpane.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/splitpane.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/splitpane.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/stopevent.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/stopevent.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/stopevent.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/stopevent.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/submenus.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/submenus.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/submenus.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/submenus.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/submenus2.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/submenus2.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/submenus2.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/submenus2.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/tabbar.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/tabbar.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/tabbar.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/tabbar.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/tablesorter.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/tablesorter.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/tablesorter.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/tablesorter.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/tabpane.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/tabpane.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/tabpane.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/tabpane.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/textarea.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/textarea.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/textarea.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/textarea.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/timers.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/timers.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/timers.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/timers.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/toolbar.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/toolbar.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/toolbar.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/toolbar.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/tooltip.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/tooltip.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/tooltip.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/tooltip.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/tracer.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/tracer.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/tracer.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/tracer.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/tree/demo.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/tree/demo.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/tree/demo.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/tree/demo.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/tree/testdata.js b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/tree/testdata.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/tree/testdata.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/tree/testdata.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/tweakui.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/tweakui.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/tweakui.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/tweakui.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/twothumbslider.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/twothumbslider.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/twothumbslider.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/twothumbslider.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/useragent.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/useragent.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/useragent.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/useragent.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/viewportsizemonitor.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/viewportsizemonitor.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/viewportsizemonitor.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/viewportsizemonitor.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/wheelhandler.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/wheelhandler.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/wheelhandler.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/wheelhandler.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/xpc/blank.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/xpc/blank.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/xpc/blank.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/xpc/blank.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/xpc/index.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/xpc/index.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/xpc/index.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/xpc/index.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/xpc/inner.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/xpc/inner.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/xpc/inner.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/xpc/inner.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/xpc/minimal/blank.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/xpc/minimal/blank.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/xpc/minimal/blank.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/xpc/minimal/blank.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/xpc/minimal/index.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/xpc/minimal/index.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/xpc/minimal/index.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/xpc/minimal/index.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/xpc/minimal/inner.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/xpc/minimal/inner.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/xpc/minimal/inner.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/xpc/minimal/inner.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/xpc/minimal/relay.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/xpc/minimal/relay.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/xpc/minimal/relay.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/xpc/minimal/relay.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/xpc/relay.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/xpc/relay.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/xpc/relay.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/xpc/relay.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/xpc/xpcdemo.js b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/xpc/xpcdemo.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/xpc/xpcdemo.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/xpc/xpcdemo.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/zippy.html b/src/module_vmap/module/javascript/test/unit/resource/goog/demos/zippy.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/demos/zippy.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/demos/zippy.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/disposable/disposable.js b/src/module_vmap/module/javascript/test/unit/resource/goog/disposable/disposable.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/disposable/disposable.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/disposable/disposable.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/disposable/idisposable.js b/src/module_vmap/module/javascript/test/unit/resource/goog/disposable/idisposable.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/disposable/idisposable.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/disposable/idisposable.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/abstractmultirange.js b/src/module_vmap/module/javascript/test/unit/resource/goog/dom/abstractmultirange.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/abstractmultirange.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/dom/abstractmultirange.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/abstractrange.js b/src/module_vmap/module/javascript/test/unit/resource/goog/dom/abstractrange.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/abstractrange.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/dom/abstractrange.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/animationframe/animationframe.js b/src/module_vmap/module/javascript/test/unit/resource/goog/dom/animationframe/animationframe.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/animationframe/animationframe.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/dom/animationframe/animationframe.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/animationframe/polyfill.js b/src/module_vmap/module/javascript/test/unit/resource/goog/dom/animationframe/polyfill.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/animationframe/polyfill.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/dom/animationframe/polyfill.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/annotate.js b/src/module_vmap/module/javascript/test/unit/resource/goog/dom/annotate.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/annotate.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/dom/annotate.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/browserfeature.js b/src/module_vmap/module/javascript/test/unit/resource/goog/dom/browserfeature.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/browserfeature.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/dom/browserfeature.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/browserrange/abstractrange.js b/src/module_vmap/module/javascript/test/unit/resource/goog/dom/browserrange/abstractrange.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/browserrange/abstractrange.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/dom/browserrange/abstractrange.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/browserrange/browserrange.js b/src/module_vmap/module/javascript/test/unit/resource/goog/dom/browserrange/browserrange.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/browserrange/browserrange.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/dom/browserrange/browserrange.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/browserrange/geckorange.js b/src/module_vmap/module/javascript/test/unit/resource/goog/dom/browserrange/geckorange.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/browserrange/geckorange.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/dom/browserrange/geckorange.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/browserrange/ierange.js b/src/module_vmap/module/javascript/test/unit/resource/goog/dom/browserrange/ierange.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/browserrange/ierange.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/dom/browserrange/ierange.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/browserrange/operarange.js b/src/module_vmap/module/javascript/test/unit/resource/goog/dom/browserrange/operarange.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/browserrange/operarange.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/dom/browserrange/operarange.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/browserrange/w3crange.js b/src/module_vmap/module/javascript/test/unit/resource/goog/dom/browserrange/w3crange.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/browserrange/w3crange.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/dom/browserrange/w3crange.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/browserrange/webkitrange.js b/src/module_vmap/module/javascript/test/unit/resource/goog/dom/browserrange/webkitrange.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/browserrange/webkitrange.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/dom/browserrange/webkitrange.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/bufferedviewportsizemonitor.js b/src/module_vmap/module/javascript/test/unit/resource/goog/dom/bufferedviewportsizemonitor.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/bufferedviewportsizemonitor.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/dom/bufferedviewportsizemonitor.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/classes.js b/src/module_vmap/module/javascript/test/unit/resource/goog/dom/classes.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/classes.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/dom/classes.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/classlist.js b/src/module_vmap/module/javascript/test/unit/resource/goog/dom/classlist.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/classlist.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/dom/classlist.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/controlrange.js b/src/module_vmap/module/javascript/test/unit/resource/goog/dom/controlrange.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/controlrange.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/dom/controlrange.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/dataset.js b/src/module_vmap/module/javascript/test/unit/resource/goog/dom/dataset.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/dataset.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/dom/dataset.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/dom.js b/src/module_vmap/module/javascript/test/unit/resource/goog/dom/dom.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/dom.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/dom/dom.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/fontsizemonitor.js b/src/module_vmap/module/javascript/test/unit/resource/goog/dom/fontsizemonitor.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/fontsizemonitor.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/dom/fontsizemonitor.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/forms.js b/src/module_vmap/module/javascript/test/unit/resource/goog/dom/forms.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/forms.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/dom/forms.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/fullscreen.js b/src/module_vmap/module/javascript/test/unit/resource/goog/dom/fullscreen.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/fullscreen.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/dom/fullscreen.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/iframe.js b/src/module_vmap/module/javascript/test/unit/resource/goog/dom/iframe.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/iframe.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/dom/iframe.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/inputtype.js b/src/module_vmap/module/javascript/test/unit/resource/goog/dom/inputtype.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/inputtype.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/dom/inputtype.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/iter.js b/src/module_vmap/module/javascript/test/unit/resource/goog/dom/iter.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/iter.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/dom/iter.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/multirange.js b/src/module_vmap/module/javascript/test/unit/resource/goog/dom/multirange.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/multirange.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/dom/multirange.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/nodeiterator.js b/src/module_vmap/module/javascript/test/unit/resource/goog/dom/nodeiterator.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/nodeiterator.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/dom/nodeiterator.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/nodeoffset.js b/src/module_vmap/module/javascript/test/unit/resource/goog/dom/nodeoffset.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/nodeoffset.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/dom/nodeoffset.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/nodetype.js b/src/module_vmap/module/javascript/test/unit/resource/goog/dom/nodetype.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/nodetype.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/dom/nodetype.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/range.js b/src/module_vmap/module/javascript/test/unit/resource/goog/dom/range.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/range.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/dom/range.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/rangeendpoint.js b/src/module_vmap/module/javascript/test/unit/resource/goog/dom/rangeendpoint.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/rangeendpoint.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/dom/rangeendpoint.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/safe.js b/src/module_vmap/module/javascript/test/unit/resource/goog/dom/safe.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/safe.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/dom/safe.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/savedcaretrange.js b/src/module_vmap/module/javascript/test/unit/resource/goog/dom/savedcaretrange.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/savedcaretrange.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/dom/savedcaretrange.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/savedrange.js b/src/module_vmap/module/javascript/test/unit/resource/goog/dom/savedrange.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/savedrange.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/dom/savedrange.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/selection.js b/src/module_vmap/module/javascript/test/unit/resource/goog/dom/selection.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/selection.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/dom/selection.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/tagiterator.js b/src/module_vmap/module/javascript/test/unit/resource/goog/dom/tagiterator.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/tagiterator.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/dom/tagiterator.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/tagname.js b/src/module_vmap/module/javascript/test/unit/resource/goog/dom/tagname.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/tagname.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/dom/tagname.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/tags.js b/src/module_vmap/module/javascript/test/unit/resource/goog/dom/tags.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/tags.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/dom/tags.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/textrange.js b/src/module_vmap/module/javascript/test/unit/resource/goog/dom/textrange.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/textrange.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/dom/textrange.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/textrangeiterator.js b/src/module_vmap/module/javascript/test/unit/resource/goog/dom/textrangeiterator.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/textrangeiterator.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/dom/textrangeiterator.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/vendor.js b/src/module_vmap/module/javascript/test/unit/resource/goog/dom/vendor.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/vendor.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/dom/vendor.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/viewportsizemonitor.js b/src/module_vmap/module/javascript/test/unit/resource/goog/dom/viewportsizemonitor.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/viewportsizemonitor.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/dom/viewportsizemonitor.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/xml.js b/src/module_vmap/module/javascript/test/unit/resource/goog/dom/xml.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/dom/xml.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/dom/xml.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/browserfeature.js b/src/module_vmap/module/javascript/test/unit/resource/goog/editor/browserfeature.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/browserfeature.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/editor/browserfeature.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/clicktoeditwrapper.js b/src/module_vmap/module/javascript/test/unit/resource/goog/editor/clicktoeditwrapper.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/clicktoeditwrapper.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/editor/clicktoeditwrapper.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/command.js b/src/module_vmap/module/javascript/test/unit/resource/goog/editor/command.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/command.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/editor/command.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/contenteditablefield.js b/src/module_vmap/module/javascript/test/unit/resource/goog/editor/contenteditablefield.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/contenteditablefield.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/editor/contenteditablefield.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/defines.js b/src/module_vmap/module/javascript/test/unit/resource/goog/editor/defines.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/defines.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/editor/defines.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/field.js b/src/module_vmap/module/javascript/test/unit/resource/goog/editor/field.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/field.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/editor/field.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/focus.js b/src/module_vmap/module/javascript/test/unit/resource/goog/editor/focus.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/focus.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/editor/focus.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/icontent.js b/src/module_vmap/module/javascript/test/unit/resource/goog/editor/icontent.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/icontent.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/editor/icontent.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/link.js b/src/module_vmap/module/javascript/test/unit/resource/goog/editor/link.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/link.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/editor/link.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/node.js b/src/module_vmap/module/javascript/test/unit/resource/goog/editor/node.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/node.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/editor/node.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/plugin.js b/src/module_vmap/module/javascript/test/unit/resource/goog/editor/plugin.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/plugin.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/editor/plugin.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/plugins/abstractbubbleplugin.js b/src/module_vmap/module/javascript/test/unit/resource/goog/editor/plugins/abstractbubbleplugin.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/plugins/abstractbubbleplugin.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/editor/plugins/abstractbubbleplugin.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/plugins/abstractdialogplugin.js b/src/module_vmap/module/javascript/test/unit/resource/goog/editor/plugins/abstractdialogplugin.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/plugins/abstractdialogplugin.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/editor/plugins/abstractdialogplugin.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/plugins/abstracttabhandler.js b/src/module_vmap/module/javascript/test/unit/resource/goog/editor/plugins/abstracttabhandler.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/plugins/abstracttabhandler.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/editor/plugins/abstracttabhandler.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/plugins/basictextformatter.js b/src/module_vmap/module/javascript/test/unit/resource/goog/editor/plugins/basictextformatter.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/plugins/basictextformatter.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/editor/plugins/basictextformatter.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/plugins/blockquote.js b/src/module_vmap/module/javascript/test/unit/resource/goog/editor/plugins/blockquote.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/plugins/blockquote.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/editor/plugins/blockquote.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/plugins/emoticons.js b/src/module_vmap/module/javascript/test/unit/resource/goog/editor/plugins/emoticons.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/plugins/emoticons.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/editor/plugins/emoticons.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/plugins/enterhandler.js b/src/module_vmap/module/javascript/test/unit/resource/goog/editor/plugins/enterhandler.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/plugins/enterhandler.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/editor/plugins/enterhandler.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/plugins/firststrong.js b/src/module_vmap/module/javascript/test/unit/resource/goog/editor/plugins/firststrong.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/plugins/firststrong.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/editor/plugins/firststrong.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/plugins/headerformatter.js b/src/module_vmap/module/javascript/test/unit/resource/goog/editor/plugins/headerformatter.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/plugins/headerformatter.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/editor/plugins/headerformatter.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/plugins/linkbubble.js b/src/module_vmap/module/javascript/test/unit/resource/goog/editor/plugins/linkbubble.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/plugins/linkbubble.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/editor/plugins/linkbubble.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/plugins/linkdialogplugin.js b/src/module_vmap/module/javascript/test/unit/resource/goog/editor/plugins/linkdialogplugin.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/plugins/linkdialogplugin.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/editor/plugins/linkdialogplugin.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/plugins/linkshortcutplugin.js b/src/module_vmap/module/javascript/test/unit/resource/goog/editor/plugins/linkshortcutplugin.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/plugins/linkshortcutplugin.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/editor/plugins/linkshortcutplugin.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/plugins/listtabhandler.js b/src/module_vmap/module/javascript/test/unit/resource/goog/editor/plugins/listtabhandler.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/plugins/listtabhandler.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/editor/plugins/listtabhandler.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/plugins/loremipsum.js b/src/module_vmap/module/javascript/test/unit/resource/goog/editor/plugins/loremipsum.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/plugins/loremipsum.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/editor/plugins/loremipsum.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/plugins/removeformatting.js b/src/module_vmap/module/javascript/test/unit/resource/goog/editor/plugins/removeformatting.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/plugins/removeformatting.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/editor/plugins/removeformatting.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/plugins/spacestabhandler.js b/src/module_vmap/module/javascript/test/unit/resource/goog/editor/plugins/spacestabhandler.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/plugins/spacestabhandler.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/editor/plugins/spacestabhandler.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/plugins/tableeditor.js b/src/module_vmap/module/javascript/test/unit/resource/goog/editor/plugins/tableeditor.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/plugins/tableeditor.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/editor/plugins/tableeditor.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/plugins/tagonenterhandler.js b/src/module_vmap/module/javascript/test/unit/resource/goog/editor/plugins/tagonenterhandler.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/plugins/tagonenterhandler.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/editor/plugins/tagonenterhandler.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/plugins/undoredo.js b/src/module_vmap/module/javascript/test/unit/resource/goog/editor/plugins/undoredo.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/plugins/undoredo.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/editor/plugins/undoredo.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/plugins/undoredomanager.js b/src/module_vmap/module/javascript/test/unit/resource/goog/editor/plugins/undoredomanager.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/plugins/undoredomanager.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/editor/plugins/undoredomanager.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/plugins/undoredostate.js b/src/module_vmap/module/javascript/test/unit/resource/goog/editor/plugins/undoredostate.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/plugins/undoredostate.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/editor/plugins/undoredostate.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/range.js b/src/module_vmap/module/javascript/test/unit/resource/goog/editor/range.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/range.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/editor/range.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/seamlessfield.js b/src/module_vmap/module/javascript/test/unit/resource/goog/editor/seamlessfield.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/seamlessfield.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/editor/seamlessfield.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/style.js b/src/module_vmap/module/javascript/test/unit/resource/goog/editor/style.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/style.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/editor/style.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/table.js b/src/module_vmap/module/javascript/test/unit/resource/goog/editor/table.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/editor/table.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/editor/table.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/events/actioneventwrapper.js b/src/module_vmap/module/javascript/test/unit/resource/goog/events/actioneventwrapper.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/events/actioneventwrapper.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/events/actioneventwrapper.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/events/actionhandler.js b/src/module_vmap/module/javascript/test/unit/resource/goog/events/actionhandler.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/events/actionhandler.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/events/actionhandler.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/events/browserevent.js b/src/module_vmap/module/javascript/test/unit/resource/goog/events/browserevent.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/events/browserevent.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/events/browserevent.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/events/browserfeature.js b/src/module_vmap/module/javascript/test/unit/resource/goog/events/browserfeature.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/events/browserfeature.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/events/browserfeature.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/events/event.js b/src/module_vmap/module/javascript/test/unit/resource/goog/events/event.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/events/event.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/events/event.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/events/eventhandler.js b/src/module_vmap/module/javascript/test/unit/resource/goog/events/eventhandler.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/events/eventhandler.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/events/eventhandler.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/events/eventid.js b/src/module_vmap/module/javascript/test/unit/resource/goog/events/eventid.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/events/eventid.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/events/eventid.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/events/events.js b/src/module_vmap/module/javascript/test/unit/resource/goog/events/events.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/events/events.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/events/events.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/events/eventtarget.js b/src/module_vmap/module/javascript/test/unit/resource/goog/events/eventtarget.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/events/eventtarget.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/events/eventtarget.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/events/eventtargettester.js b/src/module_vmap/module/javascript/test/unit/resource/goog/events/eventtargettester.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/events/eventtargettester.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/events/eventtargettester.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/events/eventtype.js b/src/module_vmap/module/javascript/test/unit/resource/goog/events/eventtype.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/events/eventtype.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/events/eventtype.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/events/eventwrapper.js b/src/module_vmap/module/javascript/test/unit/resource/goog/events/eventwrapper.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/events/eventwrapper.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/events/eventwrapper.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/events/filedrophandler.js b/src/module_vmap/module/javascript/test/unit/resource/goog/events/filedrophandler.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/events/filedrophandler.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/events/filedrophandler.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/events/focushandler.js b/src/module_vmap/module/javascript/test/unit/resource/goog/events/focushandler.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/events/focushandler.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/events/focushandler.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/events/imehandler.js b/src/module_vmap/module/javascript/test/unit/resource/goog/events/imehandler.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/events/imehandler.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/events/imehandler.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/events/inputhandler.js b/src/module_vmap/module/javascript/test/unit/resource/goog/events/inputhandler.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/events/inputhandler.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/events/inputhandler.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/events/keycodes.js b/src/module_vmap/module/javascript/test/unit/resource/goog/events/keycodes.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/events/keycodes.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/events/keycodes.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/events/keyhandler.js b/src/module_vmap/module/javascript/test/unit/resource/goog/events/keyhandler.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/events/keyhandler.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/events/keyhandler.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/events/keynames.js b/src/module_vmap/module/javascript/test/unit/resource/goog/events/keynames.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/events/keynames.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/events/keynames.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/events/listenable.js b/src/module_vmap/module/javascript/test/unit/resource/goog/events/listenable.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/events/listenable.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/events/listenable.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/events/listener.js b/src/module_vmap/module/javascript/test/unit/resource/goog/events/listener.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/events/listener.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/events/listener.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/events/listenermap.js b/src/module_vmap/module/javascript/test/unit/resource/goog/events/listenermap.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/events/listenermap.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/events/listenermap.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/events/mousewheelhandler.js b/src/module_vmap/module/javascript/test/unit/resource/goog/events/mousewheelhandler.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/events/mousewheelhandler.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/events/mousewheelhandler.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/events/onlinehandler.js b/src/module_vmap/module/javascript/test/unit/resource/goog/events/onlinehandler.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/events/onlinehandler.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/events/onlinehandler.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/events/pastehandler.js b/src/module_vmap/module/javascript/test/unit/resource/goog/events/pastehandler.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/events/pastehandler.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/events/pastehandler.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/events/wheelevent.js b/src/module_vmap/module/javascript/test/unit/resource/goog/events/wheelevent.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/events/wheelevent.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/events/wheelevent.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/events/wheelhandler.js b/src/module_vmap/module/javascript/test/unit/resource/goog/events/wheelhandler.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/events/wheelhandler.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/events/wheelhandler.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/format/emailaddress.js b/src/module_vmap/module/javascript/test/unit/resource/goog/format/emailaddress.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/format/emailaddress.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/format/emailaddress.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/format/format.js b/src/module_vmap/module/javascript/test/unit/resource/goog/format/format.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/format/format.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/format/format.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/format/htmlprettyprinter.js b/src/module_vmap/module/javascript/test/unit/resource/goog/format/htmlprettyprinter.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/format/htmlprettyprinter.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/format/htmlprettyprinter.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/format/internationalizedemailaddress.js b/src/module_vmap/module/javascript/test/unit/resource/goog/format/internationalizedemailaddress.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/format/internationalizedemailaddress.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/format/internationalizedemailaddress.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/format/jsonprettyprinter.js b/src/module_vmap/module/javascript/test/unit/resource/goog/format/jsonprettyprinter.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/format/jsonprettyprinter.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/format/jsonprettyprinter.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/fs/entry.js b/src/module_vmap/module/javascript/test/unit/resource/goog/fs/entry.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/fs/entry.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/fs/entry.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/fs/entryimpl.js b/src/module_vmap/module/javascript/test/unit/resource/goog/fs/entryimpl.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/fs/entryimpl.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/fs/entryimpl.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/fs/error.js b/src/module_vmap/module/javascript/test/unit/resource/goog/fs/error.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/fs/error.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/fs/error.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/fs/filereader.js b/src/module_vmap/module/javascript/test/unit/resource/goog/fs/filereader.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/fs/filereader.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/fs/filereader.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/fs/filesaver.js b/src/module_vmap/module/javascript/test/unit/resource/goog/fs/filesaver.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/fs/filesaver.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/fs/filesaver.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/fs/filesystem.js b/src/module_vmap/module/javascript/test/unit/resource/goog/fs/filesystem.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/fs/filesystem.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/fs/filesystem.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/fs/filesystemimpl.js b/src/module_vmap/module/javascript/test/unit/resource/goog/fs/filesystemimpl.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/fs/filesystemimpl.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/fs/filesystemimpl.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/fs/filewriter.js b/src/module_vmap/module/javascript/test/unit/resource/goog/fs/filewriter.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/fs/filewriter.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/fs/filewriter.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/fs/fs.js b/src/module_vmap/module/javascript/test/unit/resource/goog/fs/fs.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/fs/fs.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/fs/fs.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/fs/progressevent.js b/src/module_vmap/module/javascript/test/unit/resource/goog/fs/progressevent.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/fs/progressevent.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/fs/progressevent.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/fs/url.js b/src/module_vmap/module/javascript/test/unit/resource/goog/fs/url.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/fs/url.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/fs/url.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/functions/functions.js b/src/module_vmap/module/javascript/test/unit/resource/goog/functions/functions.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/functions/functions.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/functions/functions.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/fx/abstractdragdrop.js b/src/module_vmap/module/javascript/test/unit/resource/goog/fx/abstractdragdrop.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/fx/abstractdragdrop.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/fx/abstractdragdrop.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/fx/anim/anim.js b/src/module_vmap/module/javascript/test/unit/resource/goog/fx/anim/anim.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/fx/anim/anim.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/fx/anim/anim.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/fx/animation.js b/src/module_vmap/module/javascript/test/unit/resource/goog/fx/animation.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/fx/animation.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/fx/animation.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/fx/animationqueue.js b/src/module_vmap/module/javascript/test/unit/resource/goog/fx/animationqueue.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/fx/animationqueue.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/fx/animationqueue.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/fx/css3/fx.js b/src/module_vmap/module/javascript/test/unit/resource/goog/fx/css3/fx.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/fx/css3/fx.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/fx/css3/fx.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/fx/css3/transition.js b/src/module_vmap/module/javascript/test/unit/resource/goog/fx/css3/transition.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/fx/css3/transition.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/fx/css3/transition.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/fx/cssspriteanimation.js b/src/module_vmap/module/javascript/test/unit/resource/goog/fx/cssspriteanimation.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/fx/cssspriteanimation.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/fx/cssspriteanimation.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/fx/dom.js b/src/module_vmap/module/javascript/test/unit/resource/goog/fx/dom.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/fx/dom.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/fx/dom.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/fx/dragdrop.js b/src/module_vmap/module/javascript/test/unit/resource/goog/fx/dragdrop.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/fx/dragdrop.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/fx/dragdrop.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/fx/dragdropgroup.js b/src/module_vmap/module/javascript/test/unit/resource/goog/fx/dragdropgroup.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/fx/dragdropgroup.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/fx/dragdropgroup.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/fx/dragger.js b/src/module_vmap/module/javascript/test/unit/resource/goog/fx/dragger.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/fx/dragger.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/fx/dragger.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/fx/draglistgroup.js b/src/module_vmap/module/javascript/test/unit/resource/goog/fx/draglistgroup.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/fx/draglistgroup.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/fx/draglistgroup.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/fx/dragscrollsupport.js b/src/module_vmap/module/javascript/test/unit/resource/goog/fx/dragscrollsupport.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/fx/dragscrollsupport.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/fx/dragscrollsupport.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/fx/easing.js b/src/module_vmap/module/javascript/test/unit/resource/goog/fx/easing.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/fx/easing.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/fx/easing.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/fx/fx.js b/src/module_vmap/module/javascript/test/unit/resource/goog/fx/fx.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/fx/fx.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/fx/fx.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/fx/transition.js b/src/module_vmap/module/javascript/test/unit/resource/goog/fx/transition.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/fx/transition.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/fx/transition.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/fx/transitionbase.js b/src/module_vmap/module/javascript/test/unit/resource/goog/fx/transitionbase.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/fx/transitionbase.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/fx/transitionbase.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/abstractgraphics.js b/src/module_vmap/module/javascript/test/unit/resource/goog/graphics/abstractgraphics.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/abstractgraphics.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/graphics/abstractgraphics.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/affinetransform.js b/src/module_vmap/module/javascript/test/unit/resource/goog/graphics/affinetransform.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/affinetransform.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/graphics/affinetransform.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/canvaselement.js b/src/module_vmap/module/javascript/test/unit/resource/goog/graphics/canvaselement.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/canvaselement.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/graphics/canvaselement.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/canvasgraphics.js b/src/module_vmap/module/javascript/test/unit/resource/goog/graphics/canvasgraphics.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/canvasgraphics.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/graphics/canvasgraphics.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/element.js b/src/module_vmap/module/javascript/test/unit/resource/goog/graphics/element.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/element.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/graphics/element.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/ellipseelement.js b/src/module_vmap/module/javascript/test/unit/resource/goog/graphics/ellipseelement.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/ellipseelement.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/graphics/ellipseelement.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/ext/coordinates.js b/src/module_vmap/module/javascript/test/unit/resource/goog/graphics/ext/coordinates.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/ext/coordinates.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/graphics/ext/coordinates.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/ext/element.js b/src/module_vmap/module/javascript/test/unit/resource/goog/graphics/ext/element.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/ext/element.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/graphics/ext/element.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/ext/ellipse.js b/src/module_vmap/module/javascript/test/unit/resource/goog/graphics/ext/ellipse.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/ext/ellipse.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/graphics/ext/ellipse.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/ext/ext.js b/src/module_vmap/module/javascript/test/unit/resource/goog/graphics/ext/ext.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/ext/ext.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/graphics/ext/ext.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/ext/graphics.js b/src/module_vmap/module/javascript/test/unit/resource/goog/graphics/ext/graphics.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/ext/graphics.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/graphics/ext/graphics.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/ext/group.js b/src/module_vmap/module/javascript/test/unit/resource/goog/graphics/ext/group.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/ext/group.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/graphics/ext/group.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/ext/image.js b/src/module_vmap/module/javascript/test/unit/resource/goog/graphics/ext/image.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/ext/image.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/graphics/ext/image.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/ext/path.js b/src/module_vmap/module/javascript/test/unit/resource/goog/graphics/ext/path.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/ext/path.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/graphics/ext/path.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/ext/rectangle.js b/src/module_vmap/module/javascript/test/unit/resource/goog/graphics/ext/rectangle.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/ext/rectangle.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/graphics/ext/rectangle.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/ext/shape.js b/src/module_vmap/module/javascript/test/unit/resource/goog/graphics/ext/shape.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/ext/shape.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/graphics/ext/shape.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/ext/strokeandfillelement.js b/src/module_vmap/module/javascript/test/unit/resource/goog/graphics/ext/strokeandfillelement.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/ext/strokeandfillelement.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/graphics/ext/strokeandfillelement.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/fill.js b/src/module_vmap/module/javascript/test/unit/resource/goog/graphics/fill.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/fill.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/graphics/fill.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/font.js b/src/module_vmap/module/javascript/test/unit/resource/goog/graphics/font.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/font.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/graphics/font.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/graphics.js b/src/module_vmap/module/javascript/test/unit/resource/goog/graphics/graphics.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/graphics.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/graphics/graphics.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/groupelement.js b/src/module_vmap/module/javascript/test/unit/resource/goog/graphics/groupelement.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/groupelement.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/graphics/groupelement.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/imageelement.js b/src/module_vmap/module/javascript/test/unit/resource/goog/graphics/imageelement.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/imageelement.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/graphics/imageelement.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/lineargradient.js b/src/module_vmap/module/javascript/test/unit/resource/goog/graphics/lineargradient.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/lineargradient.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/graphics/lineargradient.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/path.js b/src/module_vmap/module/javascript/test/unit/resource/goog/graphics/path.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/path.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/graphics/path.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/pathelement.js b/src/module_vmap/module/javascript/test/unit/resource/goog/graphics/pathelement.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/pathelement.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/graphics/pathelement.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/paths.js b/src/module_vmap/module/javascript/test/unit/resource/goog/graphics/paths.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/paths.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/graphics/paths.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/rectelement.js b/src/module_vmap/module/javascript/test/unit/resource/goog/graphics/rectelement.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/rectelement.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/graphics/rectelement.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/solidfill.js b/src/module_vmap/module/javascript/test/unit/resource/goog/graphics/solidfill.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/solidfill.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/graphics/solidfill.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/stroke.js b/src/module_vmap/module/javascript/test/unit/resource/goog/graphics/stroke.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/stroke.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/graphics/stroke.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/strokeandfillelement.js b/src/module_vmap/module/javascript/test/unit/resource/goog/graphics/strokeandfillelement.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/strokeandfillelement.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/graphics/strokeandfillelement.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/svgelement.js b/src/module_vmap/module/javascript/test/unit/resource/goog/graphics/svgelement.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/svgelement.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/graphics/svgelement.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/svggraphics.js b/src/module_vmap/module/javascript/test/unit/resource/goog/graphics/svggraphics.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/svggraphics.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/graphics/svggraphics.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/textelement.js b/src/module_vmap/module/javascript/test/unit/resource/goog/graphics/textelement.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/textelement.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/graphics/textelement.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/vmlelement.js b/src/module_vmap/module/javascript/test/unit/resource/goog/graphics/vmlelement.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/vmlelement.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/graphics/vmlelement.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/vmlgraphics.js b/src/module_vmap/module/javascript/test/unit/resource/goog/graphics/vmlgraphics.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/graphics/vmlgraphics.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/graphics/vmlgraphics.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/history/event.js b/src/module_vmap/module/javascript/test/unit/resource/goog/history/event.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/history/event.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/history/event.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/history/eventtype.js b/src/module_vmap/module/javascript/test/unit/resource/goog/history/eventtype.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/history/eventtype.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/history/eventtype.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/history/history.js b/src/module_vmap/module/javascript/test/unit/resource/goog/history/history.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/history/history.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/history/history.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/history/html5history.js b/src/module_vmap/module/javascript/test/unit/resource/goog/history/html5history.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/history/html5history.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/history/html5history.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/html/flash.js b/src/module_vmap/module/javascript/test/unit/resource/goog/html/flash.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/html/flash.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/html/flash.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/html/legacyconversions.js b/src/module_vmap/module/javascript/test/unit/resource/goog/html/legacyconversions.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/html/legacyconversions.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/html/legacyconversions.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/html/safehtml.js b/src/module_vmap/module/javascript/test/unit/resource/goog/html/safehtml.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/html/safehtml.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/html/safehtml.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/html/safescript.js b/src/module_vmap/module/javascript/test/unit/resource/goog/html/safescript.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/html/safescript.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/html/safescript.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/html/safestyle.js b/src/module_vmap/module/javascript/test/unit/resource/goog/html/safestyle.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/html/safestyle.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/html/safestyle.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/html/safestylesheet.js b/src/module_vmap/module/javascript/test/unit/resource/goog/html/safestylesheet.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/html/safestylesheet.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/html/safestylesheet.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/html/safeurl.js b/src/module_vmap/module/javascript/test/unit/resource/goog/html/safeurl.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/html/safeurl.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/html/safeurl.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/html/silverlight.js b/src/module_vmap/module/javascript/test/unit/resource/goog/html/silverlight.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/html/silverlight.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/html/silverlight.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/html/testing.js b/src/module_vmap/module/javascript/test/unit/resource/goog/html/testing.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/html/testing.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/html/testing.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/html/trustedresourceurl.js b/src/module_vmap/module/javascript/test/unit/resource/goog/html/trustedresourceurl.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/html/trustedresourceurl.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/html/trustedresourceurl.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/html/uncheckedconversions.js b/src/module_vmap/module/javascript/test/unit/resource/goog/html/uncheckedconversions.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/html/uncheckedconversions.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/html/uncheckedconversions.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/html/utils.js b/src/module_vmap/module/javascript/test/unit/resource/goog/html/utils.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/html/utils.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/html/utils.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/i18n/bidi.js b/src/module_vmap/module/javascript/test/unit/resource/goog/i18n/bidi.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/i18n/bidi.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/i18n/bidi.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/i18n/bidiformatter.js b/src/module_vmap/module/javascript/test/unit/resource/goog/i18n/bidiformatter.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/i18n/bidiformatter.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/i18n/bidiformatter.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/i18n/charlistdecompressor.js b/src/module_vmap/module/javascript/test/unit/resource/goog/i18n/charlistdecompressor.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/i18n/charlistdecompressor.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/i18n/charlistdecompressor.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/i18n/charpickerdata.js b/src/module_vmap/module/javascript/test/unit/resource/goog/i18n/charpickerdata.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/i18n/charpickerdata.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/i18n/charpickerdata.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/i18n/collation.js b/src/module_vmap/module/javascript/test/unit/resource/goog/i18n/collation.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/i18n/collation.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/i18n/collation.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/i18n/compactnumberformatsymbols.js b/src/module_vmap/module/javascript/test/unit/resource/goog/i18n/compactnumberformatsymbols.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/i18n/compactnumberformatsymbols.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/i18n/compactnumberformatsymbols.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/i18n/compactnumberformatsymbols_ext.js b/src/module_vmap/module/javascript/test/unit/resource/goog/i18n/compactnumberformatsymbols_ext.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/i18n/compactnumberformatsymbols_ext.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/i18n/compactnumberformatsymbols_ext.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/i18n/currency.js b/src/module_vmap/module/javascript/test/unit/resource/goog/i18n/currency.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/i18n/currency.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/i18n/currency.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/i18n/currencycodemap.js b/src/module_vmap/module/javascript/test/unit/resource/goog/i18n/currencycodemap.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/i18n/currencycodemap.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/i18n/currencycodemap.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/i18n/datetimeformat.js b/src/module_vmap/module/javascript/test/unit/resource/goog/i18n/datetimeformat.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/i18n/datetimeformat.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/i18n/datetimeformat.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/i18n/datetimeparse.js b/src/module_vmap/module/javascript/test/unit/resource/goog/i18n/datetimeparse.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/i18n/datetimeparse.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/i18n/datetimeparse.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/i18n/datetimepatterns.js b/src/module_vmap/module/javascript/test/unit/resource/goog/i18n/datetimepatterns.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/i18n/datetimepatterns.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/i18n/datetimepatterns.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/i18n/datetimepatternsext.js b/src/module_vmap/module/javascript/test/unit/resource/goog/i18n/datetimepatternsext.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/i18n/datetimepatternsext.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/i18n/datetimepatternsext.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/i18n/datetimesymbols.js b/src/module_vmap/module/javascript/test/unit/resource/goog/i18n/datetimesymbols.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/i18n/datetimesymbols.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/i18n/datetimesymbols.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/i18n/datetimesymbolsext.js b/src/module_vmap/module/javascript/test/unit/resource/goog/i18n/datetimesymbolsext.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/i18n/datetimesymbolsext.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/i18n/datetimesymbolsext.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/i18n/graphemebreak.js b/src/module_vmap/module/javascript/test/unit/resource/goog/i18n/graphemebreak.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/i18n/graphemebreak.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/i18n/graphemebreak.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/i18n/messageformat.js b/src/module_vmap/module/javascript/test/unit/resource/goog/i18n/messageformat.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/i18n/messageformat.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/i18n/messageformat.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/i18n/mime.js b/src/module_vmap/module/javascript/test/unit/resource/goog/i18n/mime.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/i18n/mime.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/i18n/mime.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/i18n/numberformat.js b/src/module_vmap/module/javascript/test/unit/resource/goog/i18n/numberformat.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/i18n/numberformat.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/i18n/numberformat.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/i18n/numberformatsymbols.js b/src/module_vmap/module/javascript/test/unit/resource/goog/i18n/numberformatsymbols.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/i18n/numberformatsymbols.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/i18n/numberformatsymbols.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/i18n/numberformatsymbolsext.js b/src/module_vmap/module/javascript/test/unit/resource/goog/i18n/numberformatsymbolsext.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/i18n/numberformatsymbolsext.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/i18n/numberformatsymbolsext.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/i18n/ordinalrules.js b/src/module_vmap/module/javascript/test/unit/resource/goog/i18n/ordinalrules.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/i18n/ordinalrules.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/i18n/ordinalrules.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/i18n/pluralrules.js b/src/module_vmap/module/javascript/test/unit/resource/goog/i18n/pluralrules.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/i18n/pluralrules.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/i18n/pluralrules.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/i18n/timezone.js b/src/module_vmap/module/javascript/test/unit/resource/goog/i18n/timezone.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/i18n/timezone.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/i18n/timezone.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/i18n/uchar.js b/src/module_vmap/module/javascript/test/unit/resource/goog/i18n/uchar.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/i18n/uchar.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/i18n/uchar.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/i18n/uchar/localnamefetcher.js b/src/module_vmap/module/javascript/test/unit/resource/goog/i18n/uchar/localnamefetcher.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/i18n/uchar/localnamefetcher.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/i18n/uchar/localnamefetcher.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/i18n/uchar/namefetcher.js b/src/module_vmap/module/javascript/test/unit/resource/goog/i18n/uchar/namefetcher.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/i18n/uchar/namefetcher.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/i18n/uchar/namefetcher.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/i18n/uchar/remotenamefetcher.js b/src/module_vmap/module/javascript/test/unit/resource/goog/i18n/uchar/remotenamefetcher.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/i18n/uchar/remotenamefetcher.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/i18n/uchar/remotenamefetcher.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/blank.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/images/blank.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/blank.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/images/blank.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/bubble_close.jpg b/src/module_vmap/module/javascript/test/unit/resource/goog/images/bubble_close.jpg
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/bubble_close.jpg
rename to src/module_vmap/module/javascript/test/unit/resource/goog/images/bubble_close.jpg
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/bubble_left.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/images/bubble_left.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/bubble_left.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/images/bubble_left.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/bubble_right.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/images/bubble_right.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/bubble_right.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/images/bubble_right.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/button-bg.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/images/button-bg.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/button-bg.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/images/button-bg.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/check-outline.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/images/check-outline.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/check-outline.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/images/check-outline.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/check-sprite.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/images/check-sprite.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/check-sprite.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/images/check-sprite.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/check.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/images/check.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/check.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/images/check.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/close_box.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/images/close_box.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/close_box.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/images/close_box.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/color-swatch-tick.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/images/color-swatch-tick.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/color-swatch-tick.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/images/color-swatch-tick.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/dialog_close_box.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/images/dialog_close_box.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/dialog_close_box.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/images/dialog_close_box.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/dimension-highlighted.png b/src/module_vmap/module/javascript/test/unit/resource/goog/images/dimension-highlighted.png
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/dimension-highlighted.png
rename to src/module_vmap/module/javascript/test/unit/resource/goog/images/dimension-highlighted.png
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/dimension-unhighlighted.png b/src/module_vmap/module/javascript/test/unit/resource/goog/images/dimension-unhighlighted.png
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/dimension-unhighlighted.png
rename to src/module_vmap/module/javascript/test/unit/resource/goog/images/dimension-unhighlighted.png
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/dropdn.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/images/dropdn.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/dropdn.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/images/dropdn.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/dropdn_disabled.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/images/dropdn_disabled.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/dropdn_disabled.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/images/dropdn_disabled.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/dropdown.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/images/dropdown.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/dropdown.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/images/dropdown.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/gears_bluedot.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/images/gears_bluedot.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/gears_bluedot.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/images/gears_bluedot.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/gears_online.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/images/gears_online.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/gears_online.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/images/gears_online.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/gears_paused.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/images/gears_paused.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/gears_paused.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/images/gears_paused.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/gears_syncing.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/images/gears_syncing.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/gears_syncing.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/images/gears_syncing.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/hsv-sprite-sm.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/images/hsv-sprite-sm.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/hsv-sprite-sm.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/images/hsv-sprite-sm.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/hsv-sprite-sm.png b/src/module_vmap/module/javascript/test/unit/resource/goog/images/hsv-sprite-sm.png
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/hsv-sprite-sm.png
rename to src/module_vmap/module/javascript/test/unit/resource/goog/images/hsv-sprite-sm.png
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/hsv-sprite.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/images/hsv-sprite.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/hsv-sprite.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/images/hsv-sprite.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/hsv-sprite.png b/src/module_vmap/module/javascript/test/unit/resource/goog/images/hsv-sprite.png
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/hsv-sprite.png
rename to src/module_vmap/module/javascript/test/unit/resource/goog/images/hsv-sprite.png
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/hsva-sprite-sm.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/images/hsva-sprite-sm.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/hsva-sprite-sm.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/images/hsva-sprite-sm.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/hsva-sprite-sm.png b/src/module_vmap/module/javascript/test/unit/resource/goog/images/hsva-sprite-sm.png
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/hsva-sprite-sm.png
rename to src/module_vmap/module/javascript/test/unit/resource/goog/images/hsva-sprite-sm.png
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/hsva-sprite.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/images/hsva-sprite.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/hsva-sprite.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/images/hsva-sprite.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/hsva-sprite.png b/src/module_vmap/module/javascript/test/unit/resource/goog/images/hsva-sprite.png
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/hsva-sprite.png
rename to src/module_vmap/module/javascript/test/unit/resource/goog/images/hsva-sprite.png
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/left_anchor_bubble_bot.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/images/left_anchor_bubble_bot.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/left_anchor_bubble_bot.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/images/left_anchor_bubble_bot.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/left_anchor_bubble_top.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/images/left_anchor_bubble_top.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/left_anchor_bubble_top.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/images/left_anchor_bubble_top.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/menu-arrows.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/images/menu-arrows.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/menu-arrows.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/images/menu-arrows.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/minus.png b/src/module_vmap/module/javascript/test/unit/resource/goog/images/minus.png
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/minus.png
rename to src/module_vmap/module/javascript/test/unit/resource/goog/images/minus.png
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/no_anchor_bubble_bot.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/images/no_anchor_bubble_bot.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/no_anchor_bubble_bot.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/images/no_anchor_bubble_bot.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/no_anchor_bubble_top.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/images/no_anchor_bubble_top.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/no_anchor_bubble_top.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/images/no_anchor_bubble_top.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/offlineicons.png b/src/module_vmap/module/javascript/test/unit/resource/goog/images/offlineicons.png
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/offlineicons.png
rename to src/module_vmap/module/javascript/test/unit/resource/goog/images/offlineicons.png
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/plus.png b/src/module_vmap/module/javascript/test/unit/resource/goog/images/plus.png
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/plus.png
rename to src/module_vmap/module/javascript/test/unit/resource/goog/images/plus.png
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/ratingstars.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/images/ratingstars.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/ratingstars.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/images/ratingstars.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/right_anchor_bubble_bot.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/images/right_anchor_bubble_bot.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/right_anchor_bubble_bot.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/images/right_anchor_bubble_bot.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/right_anchor_bubble_top.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/images/right_anchor_bubble_top.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/right_anchor_bubble_top.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/images/right_anchor_bubble_top.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/toolbar-bg.png b/src/module_vmap/module/javascript/test/unit/resource/goog/images/toolbar-bg.png
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/toolbar-bg.png
rename to src/module_vmap/module/javascript/test/unit/resource/goog/images/toolbar-bg.png
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/toolbar-separator.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/images/toolbar-separator.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/toolbar-separator.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/images/toolbar-separator.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/toolbar_icons.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/images/toolbar_icons.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/toolbar_icons.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/images/toolbar_icons.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/tree/I.png b/src/module_vmap/module/javascript/test/unit/resource/goog/images/tree/I.png
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/tree/I.png
rename to src/module_vmap/module/javascript/test/unit/resource/goog/images/tree/I.png
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/tree/cleardot.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/images/tree/cleardot.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/tree/cleardot.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/images/tree/cleardot.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/tree/tree.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/images/tree/tree.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/tree/tree.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/images/tree/tree.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/tree/tree.png b/src/module_vmap/module/javascript/test/unit/resource/goog/images/tree/tree.png
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/tree/tree.png
rename to src/module_vmap/module/javascript/test/unit/resource/goog/images/tree/tree.png
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/ui_controls.jpg b/src/module_vmap/module/javascript/test/unit/resource/goog/images/ui_controls.jpg
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/images/ui_controls.jpg
rename to src/module_vmap/module/javascript/test/unit/resource/goog/images/ui_controls.jpg
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/iter/iter.js b/src/module_vmap/module/javascript/test/unit/resource/goog/iter/iter.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/iter/iter.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/iter/iter.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/json/evaljsonprocessor.js b/src/module_vmap/module/javascript/test/unit/resource/goog/json/evaljsonprocessor.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/json/evaljsonprocessor.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/json/evaljsonprocessor.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/json/hybrid.js b/src/module_vmap/module/javascript/test/unit/resource/goog/json/hybrid.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/json/hybrid.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/json/hybrid.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/json/hybridjsonprocessor.js b/src/module_vmap/module/javascript/test/unit/resource/goog/json/hybridjsonprocessor.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/json/hybridjsonprocessor.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/json/hybridjsonprocessor.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/json/json.js b/src/module_vmap/module/javascript/test/unit/resource/goog/json/json.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/json/json.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/json/json.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/json/nativejsonprocessor.js b/src/module_vmap/module/javascript/test/unit/resource/goog/json/nativejsonprocessor.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/json/nativejsonprocessor.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/json/nativejsonprocessor.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/json/processor.js b/src/module_vmap/module/javascript/test/unit/resource/goog/json/processor.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/json/processor.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/json/processor.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/dom/pagevisibilitymonitor.js b/src/module_vmap/module/javascript/test/unit/resource/goog/labs/dom/pagevisibilitymonitor.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/dom/pagevisibilitymonitor.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/labs/dom/pagevisibilitymonitor.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/events/nondisposableeventtarget.js b/src/module_vmap/module/javascript/test/unit/resource/goog/labs/events/nondisposableeventtarget.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/events/nondisposableeventtarget.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/labs/events/nondisposableeventtarget.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/events/touch.js b/src/module_vmap/module/javascript/test/unit/resource/goog/labs/events/touch.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/events/touch.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/labs/events/touch.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/format/csv.js b/src/module_vmap/module/javascript/test/unit/resource/goog/labs/format/csv.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/format/csv.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/labs/format/csv.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/html/attribute_rewriter.js b/src/module_vmap/module/javascript/test/unit/resource/goog/labs/html/attribute_rewriter.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/html/attribute_rewriter.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/labs/html/attribute_rewriter.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/html/sanitizer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/labs/html/sanitizer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/html/sanitizer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/labs/html/sanitizer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/html/scrubber.js b/src/module_vmap/module/javascript/test/unit/resource/goog/labs/html/scrubber.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/html/scrubber.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/labs/html/scrubber.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/i18n/listformat.js b/src/module_vmap/module/javascript/test/unit/resource/goog/labs/i18n/listformat.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/i18n/listformat.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/labs/i18n/listformat.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/i18n/listsymbols.js b/src/module_vmap/module/javascript/test/unit/resource/goog/labs/i18n/listsymbols.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/i18n/listsymbols.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/labs/i18n/listsymbols.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/i18n/listsymbolsext.js b/src/module_vmap/module/javascript/test/unit/resource/goog/labs/i18n/listsymbolsext.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/i18n/listsymbolsext.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/labs/i18n/listsymbolsext.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/iterable/iterable.js b/src/module_vmap/module/javascript/test/unit/resource/goog/labs/iterable/iterable.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/iterable/iterable.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/labs/iterable/iterable.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/mock/mock.js b/src/module_vmap/module/javascript/test/unit/resource/goog/labs/mock/mock.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/mock/mock.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/labs/mock/mock.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/net/image.js b/src/module_vmap/module/javascript/test/unit/resource/goog/labs/net/image.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/net/image.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/labs/net/image.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/net/testdata/cleardot.gif b/src/module_vmap/module/javascript/test/unit/resource/goog/labs/net/testdata/cleardot.gif
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/net/testdata/cleardot.gif
rename to src/module_vmap/module/javascript/test/unit/resource/goog/labs/net/testdata/cleardot.gif
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/net/testdata/xhr_test_json.data b/src/module_vmap/module/javascript/test/unit/resource/goog/labs/net/testdata/xhr_test_json.data
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/net/testdata/xhr_test_json.data
rename to src/module_vmap/module/javascript/test/unit/resource/goog/labs/net/testdata/xhr_test_json.data
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/net/testdata/xhr_test_text.data b/src/module_vmap/module/javascript/test/unit/resource/goog/labs/net/testdata/xhr_test_text.data
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/net/testdata/xhr_test_text.data
rename to src/module_vmap/module/javascript/test/unit/resource/goog/labs/net/testdata/xhr_test_text.data
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/net/webchannel.js b/src/module_vmap/module/javascript/test/unit/resource/goog/labs/net/webchannel.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/net/webchannel.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/labs/net/webchannel.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/net/webchannel/basetestchannel.js b/src/module_vmap/module/javascript/test/unit/resource/goog/labs/net/webchannel/basetestchannel.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/net/webchannel/basetestchannel.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/labs/net/webchannel/basetestchannel.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/net/webchannel/channel.js b/src/module_vmap/module/javascript/test/unit/resource/goog/labs/net/webchannel/channel.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/net/webchannel/channel.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/labs/net/webchannel/channel.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/net/webchannel/channelrequest.js b/src/module_vmap/module/javascript/test/unit/resource/goog/labs/net/webchannel/channelrequest.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/net/webchannel/channelrequest.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/labs/net/webchannel/channelrequest.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/net/webchannel/connectionstate.js b/src/module_vmap/module/javascript/test/unit/resource/goog/labs/net/webchannel/connectionstate.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/net/webchannel/connectionstate.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/labs/net/webchannel/connectionstate.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/net/webchannel/forwardchannelrequestpool.js b/src/module_vmap/module/javascript/test/unit/resource/goog/labs/net/webchannel/forwardchannelrequestpool.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/net/webchannel/forwardchannelrequestpool.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/labs/net/webchannel/forwardchannelrequestpool.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/net/webchannel/netutils.js b/src/module_vmap/module/javascript/test/unit/resource/goog/labs/net/webchannel/netutils.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/net/webchannel/netutils.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/labs/net/webchannel/netutils.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/net/webchannel/requeststats.js b/src/module_vmap/module/javascript/test/unit/resource/goog/labs/net/webchannel/requeststats.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/net/webchannel/requeststats.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/labs/net/webchannel/requeststats.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/net/webchannel/webchannelbase.js b/src/module_vmap/module/javascript/test/unit/resource/goog/labs/net/webchannel/webchannelbase.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/net/webchannel/webchannelbase.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/labs/net/webchannel/webchannelbase.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/net/webchannel/webchannelbasetransport.js b/src/module_vmap/module/javascript/test/unit/resource/goog/labs/net/webchannel/webchannelbasetransport.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/net/webchannel/webchannelbasetransport.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/labs/net/webchannel/webchannelbasetransport.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/net/webchannel/webchanneldebug.js b/src/module_vmap/module/javascript/test/unit/resource/goog/labs/net/webchannel/webchanneldebug.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/net/webchannel/webchanneldebug.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/labs/net/webchannel/webchanneldebug.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/net/webchannel/wire.js b/src/module_vmap/module/javascript/test/unit/resource/goog/labs/net/webchannel/wire.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/net/webchannel/wire.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/labs/net/webchannel/wire.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/net/webchannel/wirev8.js b/src/module_vmap/module/javascript/test/unit/resource/goog/labs/net/webchannel/wirev8.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/net/webchannel/wirev8.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/labs/net/webchannel/wirev8.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/net/webchanneltransport.js b/src/module_vmap/module/javascript/test/unit/resource/goog/labs/net/webchanneltransport.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/net/webchanneltransport.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/labs/net/webchanneltransport.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/net/webchanneltransportfactory.js b/src/module_vmap/module/javascript/test/unit/resource/goog/labs/net/webchanneltransportfactory.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/net/webchanneltransportfactory.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/labs/net/webchanneltransportfactory.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/net/xhr.js b/src/module_vmap/module/javascript/test/unit/resource/goog/labs/net/xhr.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/net/xhr.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/labs/net/xhr.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/object/object.js b/src/module_vmap/module/javascript/test/unit/resource/goog/labs/object/object.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/object/object.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/labs/object/object.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/pubsub/broadcastpubsub.js b/src/module_vmap/module/javascript/test/unit/resource/goog/labs/pubsub/broadcastpubsub.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/pubsub/broadcastpubsub.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/labs/pubsub/broadcastpubsub.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/storage/boundedcollectablestorage.js b/src/module_vmap/module/javascript/test/unit/resource/goog/labs/storage/boundedcollectablestorage.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/storage/boundedcollectablestorage.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/labs/storage/boundedcollectablestorage.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/structs/map.js b/src/module_vmap/module/javascript/test/unit/resource/goog/labs/structs/map.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/structs/map.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/labs/structs/map.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/structs/multimap.js b/src/module_vmap/module/javascript/test/unit/resource/goog/labs/structs/multimap.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/structs/multimap.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/labs/structs/multimap.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/style/pixeldensitymonitor.js b/src/module_vmap/module/javascript/test/unit/resource/goog/labs/style/pixeldensitymonitor.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/style/pixeldensitymonitor.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/labs/style/pixeldensitymonitor.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/testing/assertthat.js b/src/module_vmap/module/javascript/test/unit/resource/goog/labs/testing/assertthat.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/testing/assertthat.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/labs/testing/assertthat.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/testing/decoratormatcher.js b/src/module_vmap/module/javascript/test/unit/resource/goog/labs/testing/decoratormatcher.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/testing/decoratormatcher.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/labs/testing/decoratormatcher.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/testing/dictionarymatcher.js b/src/module_vmap/module/javascript/test/unit/resource/goog/labs/testing/dictionarymatcher.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/testing/dictionarymatcher.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/labs/testing/dictionarymatcher.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/testing/environment.js b/src/module_vmap/module/javascript/test/unit/resource/goog/labs/testing/environment.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/testing/environment.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/labs/testing/environment.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/testing/logicmatcher.js b/src/module_vmap/module/javascript/test/unit/resource/goog/labs/testing/logicmatcher.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/testing/logicmatcher.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/labs/testing/logicmatcher.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/testing/matcher.js b/src/module_vmap/module/javascript/test/unit/resource/goog/labs/testing/matcher.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/testing/matcher.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/labs/testing/matcher.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/testing/numbermatcher.js b/src/module_vmap/module/javascript/test/unit/resource/goog/labs/testing/numbermatcher.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/testing/numbermatcher.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/labs/testing/numbermatcher.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/testing/objectmatcher.js b/src/module_vmap/module/javascript/test/unit/resource/goog/labs/testing/objectmatcher.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/testing/objectmatcher.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/labs/testing/objectmatcher.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/testing/stringmatcher.js b/src/module_vmap/module/javascript/test/unit/resource/goog/labs/testing/stringmatcher.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/testing/stringmatcher.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/labs/testing/stringmatcher.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/useragent/browser.js b/src/module_vmap/module/javascript/test/unit/resource/goog/labs/useragent/browser.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/useragent/browser.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/labs/useragent/browser.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/useragent/device.js b/src/module_vmap/module/javascript/test/unit/resource/goog/labs/useragent/device.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/useragent/device.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/labs/useragent/device.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/useragent/engine.js b/src/module_vmap/module/javascript/test/unit/resource/goog/labs/useragent/engine.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/useragent/engine.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/labs/useragent/engine.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/useragent/platform.js b/src/module_vmap/module/javascript/test/unit/resource/goog/labs/useragent/platform.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/useragent/platform.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/labs/useragent/platform.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/useragent/test_agents.js b/src/module_vmap/module/javascript/test/unit/resource/goog/labs/useragent/test_agents.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/useragent/test_agents.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/labs/useragent/test_agents.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/useragent/util.js b/src/module_vmap/module/javascript/test/unit/resource/goog/labs/useragent/util.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/labs/useragent/util.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/labs/useragent/util.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/locale/countries.js b/src/module_vmap/module/javascript/test/unit/resource/goog/locale/countries.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/locale/countries.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/locale/countries.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/locale/defaultlocalenameconstants.js b/src/module_vmap/module/javascript/test/unit/resource/goog/locale/defaultlocalenameconstants.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/locale/defaultlocalenameconstants.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/locale/defaultlocalenameconstants.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/locale/genericfontnames.js b/src/module_vmap/module/javascript/test/unit/resource/goog/locale/genericfontnames.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/locale/genericfontnames.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/locale/genericfontnames.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/locale/genericfontnamesdata.js b/src/module_vmap/module/javascript/test/unit/resource/goog/locale/genericfontnamesdata.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/locale/genericfontnamesdata.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/locale/genericfontnamesdata.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/locale/locale.js b/src/module_vmap/module/javascript/test/unit/resource/goog/locale/locale.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/locale/locale.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/locale/locale.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/locale/nativenameconstants.js b/src/module_vmap/module/javascript/test/unit/resource/goog/locale/nativenameconstants.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/locale/nativenameconstants.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/locale/nativenameconstants.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/locale/scriptToLanguages.js b/src/module_vmap/module/javascript/test/unit/resource/goog/locale/scriptToLanguages.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/locale/scriptToLanguages.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/locale/scriptToLanguages.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/locale/timezonedetection.js b/src/module_vmap/module/javascript/test/unit/resource/goog/locale/timezonedetection.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/locale/timezonedetection.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/locale/timezonedetection.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/locale/timezonefingerprint.js b/src/module_vmap/module/javascript/test/unit/resource/goog/locale/timezonefingerprint.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/locale/timezonefingerprint.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/locale/timezonefingerprint.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/locale/timezonelist.js b/src/module_vmap/module/javascript/test/unit/resource/goog/locale/timezonelist.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/locale/timezonelist.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/locale/timezonelist.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/log/log.js b/src/module_vmap/module/javascript/test/unit/resource/goog/log/log.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/log/log.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/log/log.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/math/affinetransform.js b/src/module_vmap/module/javascript/test/unit/resource/goog/math/affinetransform.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/math/affinetransform.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/math/affinetransform.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/math/bezier.js b/src/module_vmap/module/javascript/test/unit/resource/goog/math/bezier.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/math/bezier.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/math/bezier.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/math/box.js b/src/module_vmap/module/javascript/test/unit/resource/goog/math/box.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/math/box.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/math/box.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/math/coordinate.js b/src/module_vmap/module/javascript/test/unit/resource/goog/math/coordinate.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/math/coordinate.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/math/coordinate.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/math/coordinate3.js b/src/module_vmap/module/javascript/test/unit/resource/goog/math/coordinate3.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/math/coordinate3.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/math/coordinate3.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/math/exponentialbackoff.js b/src/module_vmap/module/javascript/test/unit/resource/goog/math/exponentialbackoff.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/math/exponentialbackoff.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/math/exponentialbackoff.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/math/integer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/math/integer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/math/integer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/math/integer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/math/interpolator/interpolator1.js b/src/module_vmap/module/javascript/test/unit/resource/goog/math/interpolator/interpolator1.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/math/interpolator/interpolator1.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/math/interpolator/interpolator1.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/math/interpolator/linear1.js b/src/module_vmap/module/javascript/test/unit/resource/goog/math/interpolator/linear1.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/math/interpolator/linear1.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/math/interpolator/linear1.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/math/interpolator/pchip1.js b/src/module_vmap/module/javascript/test/unit/resource/goog/math/interpolator/pchip1.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/math/interpolator/pchip1.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/math/interpolator/pchip1.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/math/interpolator/spline1.js b/src/module_vmap/module/javascript/test/unit/resource/goog/math/interpolator/spline1.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/math/interpolator/spline1.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/math/interpolator/spline1.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/math/line.js b/src/module_vmap/module/javascript/test/unit/resource/goog/math/line.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/math/line.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/math/line.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/math/long.js b/src/module_vmap/module/javascript/test/unit/resource/goog/math/long.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/math/long.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/math/long.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/math/math.js b/src/module_vmap/module/javascript/test/unit/resource/goog/math/math.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/math/math.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/math/math.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/math/matrix.js b/src/module_vmap/module/javascript/test/unit/resource/goog/math/matrix.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/math/matrix.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/math/matrix.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/math/path.js b/src/module_vmap/module/javascript/test/unit/resource/goog/math/path.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/math/path.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/math/path.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/math/paths.js b/src/module_vmap/module/javascript/test/unit/resource/goog/math/paths.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/math/paths.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/math/paths.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/math/range.js b/src/module_vmap/module/javascript/test/unit/resource/goog/math/range.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/math/range.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/math/range.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/math/rangeset.js b/src/module_vmap/module/javascript/test/unit/resource/goog/math/rangeset.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/math/rangeset.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/math/rangeset.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/math/rect.js b/src/module_vmap/module/javascript/test/unit/resource/goog/math/rect.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/math/rect.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/math/rect.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/math/size.js b/src/module_vmap/module/javascript/test/unit/resource/goog/math/size.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/math/size.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/math/size.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/math/tdma.js b/src/module_vmap/module/javascript/test/unit/resource/goog/math/tdma.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/math/tdma.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/math/tdma.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/math/vec2.js b/src/module_vmap/module/javascript/test/unit/resource/goog/math/vec2.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/math/vec2.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/math/vec2.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/math/vec3.js b/src/module_vmap/module/javascript/test/unit/resource/goog/math/vec3.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/math/vec3.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/math/vec3.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/memoize/memoize.js b/src/module_vmap/module/javascript/test/unit/resource/goog/memoize/memoize.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/memoize/memoize.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/memoize/memoize.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/messaging/abstractchannel.js b/src/module_vmap/module/javascript/test/unit/resource/goog/messaging/abstractchannel.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/messaging/abstractchannel.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/messaging/abstractchannel.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/messaging/bufferedchannel.js b/src/module_vmap/module/javascript/test/unit/resource/goog/messaging/bufferedchannel.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/messaging/bufferedchannel.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/messaging/bufferedchannel.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/messaging/deferredchannel.js b/src/module_vmap/module/javascript/test/unit/resource/goog/messaging/deferredchannel.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/messaging/deferredchannel.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/messaging/deferredchannel.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/messaging/loggerclient.js b/src/module_vmap/module/javascript/test/unit/resource/goog/messaging/loggerclient.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/messaging/loggerclient.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/messaging/loggerclient.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/messaging/loggerserver.js b/src/module_vmap/module/javascript/test/unit/resource/goog/messaging/loggerserver.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/messaging/loggerserver.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/messaging/loggerserver.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/messaging/messagechannel.js b/src/module_vmap/module/javascript/test/unit/resource/goog/messaging/messagechannel.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/messaging/messagechannel.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/messaging/messagechannel.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/messaging/messaging.js b/src/module_vmap/module/javascript/test/unit/resource/goog/messaging/messaging.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/messaging/messaging.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/messaging/messaging.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/messaging/multichannel.js b/src/module_vmap/module/javascript/test/unit/resource/goog/messaging/multichannel.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/messaging/multichannel.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/messaging/multichannel.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/messaging/portcaller.js b/src/module_vmap/module/javascript/test/unit/resource/goog/messaging/portcaller.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/messaging/portcaller.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/messaging/portcaller.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/messaging/portchannel.js b/src/module_vmap/module/javascript/test/unit/resource/goog/messaging/portchannel.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/messaging/portchannel.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/messaging/portchannel.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/messaging/portnetwork.js b/src/module_vmap/module/javascript/test/unit/resource/goog/messaging/portnetwork.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/messaging/portnetwork.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/messaging/portnetwork.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/messaging/portoperator.js b/src/module_vmap/module/javascript/test/unit/resource/goog/messaging/portoperator.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/messaging/portoperator.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/messaging/portoperator.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/messaging/respondingchannel.js b/src/module_vmap/module/javascript/test/unit/resource/goog/messaging/respondingchannel.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/messaging/respondingchannel.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/messaging/respondingchannel.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/messaging/testdata/portchannel_inner.html b/src/module_vmap/module/javascript/test/unit/resource/goog/messaging/testdata/portchannel_inner.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/messaging/testdata/portchannel_inner.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/messaging/testdata/portchannel_inner.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/messaging/testdata/portchannel_worker.js b/src/module_vmap/module/javascript/test/unit/resource/goog/messaging/testdata/portchannel_worker.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/messaging/testdata/portchannel_worker.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/messaging/testdata/portchannel_worker.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/messaging/testdata/portchannel_wrong_origin_inner.html b/src/module_vmap/module/javascript/test/unit/resource/goog/messaging/testdata/portchannel_wrong_origin_inner.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/messaging/testdata/portchannel_wrong_origin_inner.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/messaging/testdata/portchannel_wrong_origin_inner.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/messaging/testdata/portnetwork_inner.html b/src/module_vmap/module/javascript/test/unit/resource/goog/messaging/testdata/portnetwork_inner.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/messaging/testdata/portnetwork_inner.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/messaging/testdata/portnetwork_inner.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/messaging/testdata/portnetwork_worker1.js b/src/module_vmap/module/javascript/test/unit/resource/goog/messaging/testdata/portnetwork_worker1.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/messaging/testdata/portnetwork_worker1.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/messaging/testdata/portnetwork_worker1.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/messaging/testdata/portnetwork_worker2.js b/src/module_vmap/module/javascript/test/unit/resource/goog/messaging/testdata/portnetwork_worker2.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/messaging/testdata/portnetwork_worker2.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/messaging/testdata/portnetwork_worker2.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/module/abstractmoduleloader.js b/src/module_vmap/module/javascript/test/unit/resource/goog/module/abstractmoduleloader.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/module/abstractmoduleloader.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/module/abstractmoduleloader.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/module/basemodule.js b/src/module_vmap/module/javascript/test/unit/resource/goog/module/basemodule.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/module/basemodule.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/module/basemodule.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/module/loader.js b/src/module_vmap/module/javascript/test/unit/resource/goog/module/loader.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/module/loader.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/module/loader.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/module/module.js b/src/module_vmap/module/javascript/test/unit/resource/goog/module/module.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/module/module.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/module/module.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/module/moduleinfo.js b/src/module_vmap/module/javascript/test/unit/resource/goog/module/moduleinfo.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/module/moduleinfo.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/module/moduleinfo.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/module/moduleloadcallback.js b/src/module_vmap/module/javascript/test/unit/resource/goog/module/moduleloadcallback.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/module/moduleloadcallback.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/module/moduleloadcallback.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/module/moduleloader.js b/src/module_vmap/module/javascript/test/unit/resource/goog/module/moduleloader.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/module/moduleloader.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/module/moduleloader.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/module/modulemanager.js b/src/module_vmap/module/javascript/test/unit/resource/goog/module/modulemanager.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/module/modulemanager.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/module/modulemanager.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/module/testdata/modA_1.js b/src/module_vmap/module/javascript/test/unit/resource/goog/module/testdata/modA_1.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/module/testdata/modA_1.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/module/testdata/modA_1.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/module/testdata/modA_2.js b/src/module_vmap/module/javascript/test/unit/resource/goog/module/testdata/modA_2.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/module/testdata/modA_2.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/module/testdata/modA_2.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/module/testdata/modB_1.js b/src/module_vmap/module/javascript/test/unit/resource/goog/module/testdata/modB_1.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/module/testdata/modB_1.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/module/testdata/modB_1.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/browserchannel.js b/src/module_vmap/module/javascript/test/unit/resource/goog/net/browserchannel.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/browserchannel.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/net/browserchannel.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/browsertestchannel.js b/src/module_vmap/module/javascript/test/unit/resource/goog/net/browsertestchannel.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/browsertestchannel.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/net/browsertestchannel.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/bulkloader.js b/src/module_vmap/module/javascript/test/unit/resource/goog/net/bulkloader.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/bulkloader.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/net/bulkloader.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/bulkloaderhelper.js b/src/module_vmap/module/javascript/test/unit/resource/goog/net/bulkloaderhelper.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/bulkloaderhelper.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/net/bulkloaderhelper.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/channeldebug.js b/src/module_vmap/module/javascript/test/unit/resource/goog/net/channeldebug.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/channeldebug.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/net/channeldebug.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/channelrequest.js b/src/module_vmap/module/javascript/test/unit/resource/goog/net/channelrequest.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/channelrequest.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/net/channelrequest.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/cookies.js b/src/module_vmap/module/javascript/test/unit/resource/goog/net/cookies.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/cookies.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/net/cookies.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/corsxmlhttpfactory.js b/src/module_vmap/module/javascript/test/unit/resource/goog/net/corsxmlhttpfactory.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/corsxmlhttpfactory.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/net/corsxmlhttpfactory.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/crossdomainrpc.js b/src/module_vmap/module/javascript/test/unit/resource/goog/net/crossdomainrpc.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/crossdomainrpc.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/net/crossdomainrpc.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/errorcode.js b/src/module_vmap/module/javascript/test/unit/resource/goog/net/errorcode.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/errorcode.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/net/errorcode.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/eventtype.js b/src/module_vmap/module/javascript/test/unit/resource/goog/net/eventtype.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/eventtype.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/net/eventtype.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/filedownloader.js b/src/module_vmap/module/javascript/test/unit/resource/goog/net/filedownloader.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/filedownloader.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/net/filedownloader.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/httpstatus.js b/src/module_vmap/module/javascript/test/unit/resource/goog/net/httpstatus.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/httpstatus.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/net/httpstatus.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/iframeio.js b/src/module_vmap/module/javascript/test/unit/resource/goog/net/iframeio.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/iframeio.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/net/iframeio.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/iframeloadmonitor.js b/src/module_vmap/module/javascript/test/unit/resource/goog/net/iframeloadmonitor.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/iframeloadmonitor.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/net/iframeloadmonitor.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/imageloader.js b/src/module_vmap/module/javascript/test/unit/resource/goog/net/imageloader.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/imageloader.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/net/imageloader.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/ipaddress.js b/src/module_vmap/module/javascript/test/unit/resource/goog/net/ipaddress.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/ipaddress.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/net/ipaddress.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/jsloader.js b/src/module_vmap/module/javascript/test/unit/resource/goog/net/jsloader.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/jsloader.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/net/jsloader.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/jsonp.js b/src/module_vmap/module/javascript/test/unit/resource/goog/net/jsonp.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/jsonp.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/net/jsonp.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/mockiframeio.js b/src/module_vmap/module/javascript/test/unit/resource/goog/net/mockiframeio.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/mockiframeio.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/net/mockiframeio.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/multiiframeloadmonitor.js b/src/module_vmap/module/javascript/test/unit/resource/goog/net/multiiframeloadmonitor.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/multiiframeloadmonitor.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/net/multiiframeloadmonitor.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/networkstatusmonitor.js b/src/module_vmap/module/javascript/test/unit/resource/goog/net/networkstatusmonitor.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/networkstatusmonitor.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/net/networkstatusmonitor.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/networktester.js b/src/module_vmap/module/javascript/test/unit/resource/goog/net/networktester.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/networktester.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/net/networktester.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/testdata/jsloader_test1.js b/src/module_vmap/module/javascript/test/unit/resource/goog/net/testdata/jsloader_test1.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/testdata/jsloader_test1.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/net/testdata/jsloader_test1.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/testdata/jsloader_test2.js b/src/module_vmap/module/javascript/test/unit/resource/goog/net/testdata/jsloader_test2.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/testdata/jsloader_test2.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/net/testdata/jsloader_test2.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/testdata/jsloader_test3.js b/src/module_vmap/module/javascript/test/unit/resource/goog/net/testdata/jsloader_test3.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/testdata/jsloader_test3.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/net/testdata/jsloader_test3.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/testdata/jsloader_test4.js b/src/module_vmap/module/javascript/test/unit/resource/goog/net/testdata/jsloader_test4.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/testdata/jsloader_test4.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/net/testdata/jsloader_test4.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/tmpnetwork.js b/src/module_vmap/module/javascript/test/unit/resource/goog/net/tmpnetwork.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/tmpnetwork.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/net/tmpnetwork.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/websocket.js b/src/module_vmap/module/javascript/test/unit/resource/goog/net/websocket.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/websocket.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/net/websocket.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/wrapperxmlhttpfactory.js b/src/module_vmap/module/javascript/test/unit/resource/goog/net/wrapperxmlhttpfactory.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/wrapperxmlhttpfactory.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/net/wrapperxmlhttpfactory.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/xhrio.js b/src/module_vmap/module/javascript/test/unit/resource/goog/net/xhrio.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/xhrio.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/net/xhrio.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/xhriopool.js b/src/module_vmap/module/javascript/test/unit/resource/goog/net/xhriopool.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/xhriopool.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/net/xhriopool.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/xhrlike.js b/src/module_vmap/module/javascript/test/unit/resource/goog/net/xhrlike.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/xhrlike.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/net/xhrlike.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/xhrmanager.js b/src/module_vmap/module/javascript/test/unit/resource/goog/net/xhrmanager.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/xhrmanager.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/net/xhrmanager.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/xmlhttp.js b/src/module_vmap/module/javascript/test/unit/resource/goog/net/xmlhttp.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/xmlhttp.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/net/xmlhttp.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/xmlhttpfactory.js b/src/module_vmap/module/javascript/test/unit/resource/goog/net/xmlhttpfactory.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/xmlhttpfactory.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/net/xmlhttpfactory.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/xpc/crosspagechannel.js b/src/module_vmap/module/javascript/test/unit/resource/goog/net/xpc/crosspagechannel.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/xpc/crosspagechannel.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/net/xpc/crosspagechannel.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/xpc/crosspagechannelrole.js b/src/module_vmap/module/javascript/test/unit/resource/goog/net/xpc/crosspagechannelrole.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/xpc/crosspagechannelrole.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/net/xpc/crosspagechannelrole.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/xpc/directtransport.js b/src/module_vmap/module/javascript/test/unit/resource/goog/net/xpc/directtransport.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/xpc/directtransport.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/net/xpc/directtransport.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/xpc/frameelementmethodtransport.js b/src/module_vmap/module/javascript/test/unit/resource/goog/net/xpc/frameelementmethodtransport.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/xpc/frameelementmethodtransport.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/net/xpc/frameelementmethodtransport.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/xpc/iframepollingtransport.js b/src/module_vmap/module/javascript/test/unit/resource/goog/net/xpc/iframepollingtransport.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/xpc/iframepollingtransport.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/net/xpc/iframepollingtransport.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/xpc/iframerelaytransport.js b/src/module_vmap/module/javascript/test/unit/resource/goog/net/xpc/iframerelaytransport.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/xpc/iframerelaytransport.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/net/xpc/iframerelaytransport.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/xpc/nativemessagingtransport.js b/src/module_vmap/module/javascript/test/unit/resource/goog/net/xpc/nativemessagingtransport.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/xpc/nativemessagingtransport.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/net/xpc/nativemessagingtransport.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/xpc/nixtransport.js b/src/module_vmap/module/javascript/test/unit/resource/goog/net/xpc/nixtransport.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/xpc/nixtransport.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/net/xpc/nixtransport.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/xpc/relay.js b/src/module_vmap/module/javascript/test/unit/resource/goog/net/xpc/relay.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/xpc/relay.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/net/xpc/relay.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/xpc/testdata/access_checker.html b/src/module_vmap/module/javascript/test/unit/resource/goog/net/xpc/testdata/access_checker.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/xpc/testdata/access_checker.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/net/xpc/testdata/access_checker.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/xpc/testdata/inner_peer.html b/src/module_vmap/module/javascript/test/unit/resource/goog/net/xpc/testdata/inner_peer.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/xpc/testdata/inner_peer.html
rename to src/module_vmap/module/javascript/test/unit/resource/goog/net/xpc/testdata/inner_peer.html
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/xpc/transport.js b/src/module_vmap/module/javascript/test/unit/resource/goog/net/xpc/transport.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/xpc/transport.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/net/xpc/transport.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/xpc/xpc.js b/src/module_vmap/module/javascript/test/unit/resource/goog/net/xpc/xpc.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/net/xpc/xpc.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/net/xpc/xpc.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/object/object.js b/src/module_vmap/module/javascript/test/unit/resource/goog/object/object.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/object/object.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/object/object.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/positioning/absoluteposition.js b/src/module_vmap/module/javascript/test/unit/resource/goog/positioning/absoluteposition.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/positioning/absoluteposition.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/positioning/absoluteposition.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/positioning/abstractposition.js b/src/module_vmap/module/javascript/test/unit/resource/goog/positioning/abstractposition.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/positioning/abstractposition.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/positioning/abstractposition.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/positioning/anchoredposition.js b/src/module_vmap/module/javascript/test/unit/resource/goog/positioning/anchoredposition.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/positioning/anchoredposition.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/positioning/anchoredposition.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/positioning/anchoredviewportposition.js b/src/module_vmap/module/javascript/test/unit/resource/goog/positioning/anchoredviewportposition.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/positioning/anchoredviewportposition.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/positioning/anchoredviewportposition.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/positioning/clientposition.js b/src/module_vmap/module/javascript/test/unit/resource/goog/positioning/clientposition.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/positioning/clientposition.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/positioning/clientposition.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/positioning/menuanchoredposition.js b/src/module_vmap/module/javascript/test/unit/resource/goog/positioning/menuanchoredposition.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/positioning/menuanchoredposition.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/positioning/menuanchoredposition.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/positioning/positioning.js b/src/module_vmap/module/javascript/test/unit/resource/goog/positioning/positioning.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/positioning/positioning.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/positioning/positioning.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/positioning/viewportclientposition.js b/src/module_vmap/module/javascript/test/unit/resource/goog/positioning/viewportclientposition.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/positioning/viewportclientposition.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/positioning/viewportclientposition.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/positioning/viewportposition.js b/src/module_vmap/module/javascript/test/unit/resource/goog/positioning/viewportposition.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/positioning/viewportposition.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/positioning/viewportposition.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/promise/promise.js b/src/module_vmap/module/javascript/test/unit/resource/goog/promise/promise.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/promise/promise.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/promise/promise.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/promise/resolver.js b/src/module_vmap/module/javascript/test/unit/resource/goog/promise/resolver.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/promise/resolver.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/promise/resolver.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/promise/testsuiteadapter.js b/src/module_vmap/module/javascript/test/unit/resource/goog/promise/testsuiteadapter.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/promise/testsuiteadapter.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/promise/testsuiteadapter.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/promise/thenable.js b/src/module_vmap/module/javascript/test/unit/resource/goog/promise/thenable.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/promise/thenable.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/promise/thenable.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/proto/proto.js b/src/module_vmap/module/javascript/test/unit/resource/goog/proto/proto.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/proto/proto.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/proto/proto.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/proto/serializer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/proto/serializer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/proto/serializer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/proto/serializer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/proto2/descriptor.js b/src/module_vmap/module/javascript/test/unit/resource/goog/proto2/descriptor.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/proto2/descriptor.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/proto2/descriptor.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/proto2/fielddescriptor.js b/src/module_vmap/module/javascript/test/unit/resource/goog/proto2/fielddescriptor.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/proto2/fielddescriptor.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/proto2/fielddescriptor.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/proto2/lazydeserializer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/proto2/lazydeserializer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/proto2/lazydeserializer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/proto2/lazydeserializer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/proto2/message.js b/src/module_vmap/module/javascript/test/unit/resource/goog/proto2/message.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/proto2/message.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/proto2/message.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/proto2/objectserializer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/proto2/objectserializer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/proto2/objectserializer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/proto2/objectserializer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/proto2/package_test.pb.js b/src/module_vmap/module/javascript/test/unit/resource/goog/proto2/package_test.pb.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/proto2/package_test.pb.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/proto2/package_test.pb.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/proto2/pbliteserializer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/proto2/pbliteserializer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/proto2/pbliteserializer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/proto2/pbliteserializer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/proto2/serializer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/proto2/serializer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/proto2/serializer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/proto2/serializer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/proto2/test.pb.js b/src/module_vmap/module/javascript/test/unit/resource/goog/proto2/test.pb.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/proto2/test.pb.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/proto2/test.pb.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/proto2/textformatserializer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/proto2/textformatserializer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/proto2/textformatserializer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/proto2/textformatserializer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/proto2/util.js b/src/module_vmap/module/javascript/test/unit/resource/goog/proto2/util.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/proto2/util.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/proto2/util.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/pubsub/pubsub.js b/src/module_vmap/module/javascript/test/unit/resource/goog/pubsub/pubsub.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/pubsub/pubsub.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/pubsub/pubsub.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/pubsub/topicid.js b/src/module_vmap/module/javascript/test/unit/resource/goog/pubsub/topicid.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/pubsub/topicid.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/pubsub/topicid.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/pubsub/typedpubsub.js b/src/module_vmap/module/javascript/test/unit/resource/goog/pubsub/typedpubsub.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/pubsub/typedpubsub.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/pubsub/typedpubsub.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/reflect/reflect.js b/src/module_vmap/module/javascript/test/unit/resource/goog/reflect/reflect.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/reflect/reflect.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/reflect/reflect.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/result/deferredadaptor.js b/src/module_vmap/module/javascript/test/unit/resource/goog/result/deferredadaptor.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/result/deferredadaptor.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/result/deferredadaptor.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/result/dependentresult.js b/src/module_vmap/module/javascript/test/unit/resource/goog/result/dependentresult.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/result/dependentresult.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/result/dependentresult.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/result/result_interface.js b/src/module_vmap/module/javascript/test/unit/resource/goog/result/result_interface.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/result/result_interface.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/result/result_interface.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/result/resultutil.js b/src/module_vmap/module/javascript/test/unit/resource/goog/result/resultutil.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/result/resultutil.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/result/resultutil.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/result/simpleresult.js b/src/module_vmap/module/javascript/test/unit/resource/goog/result/simpleresult.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/result/simpleresult.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/result/simpleresult.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/soy/data.js b/src/module_vmap/module/javascript/test/unit/resource/goog/soy/data.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/soy/data.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/soy/data.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/soy/renderer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/soy/renderer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/soy/renderer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/soy/renderer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/soy/soy.js b/src/module_vmap/module/javascript/test/unit/resource/goog/soy/soy.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/soy/soy.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/soy/soy.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/spell/spellcheck.js b/src/module_vmap/module/javascript/test/unit/resource/goog/spell/spellcheck.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/spell/spellcheck.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/spell/spellcheck.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/stats/basicstat.js b/src/module_vmap/module/javascript/test/unit/resource/goog/stats/basicstat.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/stats/basicstat.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/stats/basicstat.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/storage/collectablestorage.js b/src/module_vmap/module/javascript/test/unit/resource/goog/storage/collectablestorage.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/storage/collectablestorage.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/storage/collectablestorage.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/storage/collectablestoragetester.js b/src/module_vmap/module/javascript/test/unit/resource/goog/storage/collectablestoragetester.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/storage/collectablestoragetester.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/storage/collectablestoragetester.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/storage/encryptedstorage.js b/src/module_vmap/module/javascript/test/unit/resource/goog/storage/encryptedstorage.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/storage/encryptedstorage.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/storage/encryptedstorage.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/storage/errorcode.js b/src/module_vmap/module/javascript/test/unit/resource/goog/storage/errorcode.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/storage/errorcode.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/storage/errorcode.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/storage/expiringstorage.js b/src/module_vmap/module/javascript/test/unit/resource/goog/storage/expiringstorage.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/storage/expiringstorage.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/storage/expiringstorage.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/storage/mechanism/errorcode.js b/src/module_vmap/module/javascript/test/unit/resource/goog/storage/mechanism/errorcode.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/storage/mechanism/errorcode.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/storage/mechanism/errorcode.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/storage/mechanism/errorhandlingmechanism.js b/src/module_vmap/module/javascript/test/unit/resource/goog/storage/mechanism/errorhandlingmechanism.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/storage/mechanism/errorhandlingmechanism.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/storage/mechanism/errorhandlingmechanism.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/storage/mechanism/html5localstorage.js b/src/module_vmap/module/javascript/test/unit/resource/goog/storage/mechanism/html5localstorage.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/storage/mechanism/html5localstorage.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/storage/mechanism/html5localstorage.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/storage/mechanism/html5sessionstorage.js b/src/module_vmap/module/javascript/test/unit/resource/goog/storage/mechanism/html5sessionstorage.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/storage/mechanism/html5sessionstorage.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/storage/mechanism/html5sessionstorage.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/storage/mechanism/html5webstorage.js b/src/module_vmap/module/javascript/test/unit/resource/goog/storage/mechanism/html5webstorage.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/storage/mechanism/html5webstorage.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/storage/mechanism/html5webstorage.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/storage/mechanism/ieuserdata.js b/src/module_vmap/module/javascript/test/unit/resource/goog/storage/mechanism/ieuserdata.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/storage/mechanism/ieuserdata.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/storage/mechanism/ieuserdata.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/storage/mechanism/iterablemechanism.js b/src/module_vmap/module/javascript/test/unit/resource/goog/storage/mechanism/iterablemechanism.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/storage/mechanism/iterablemechanism.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/storage/mechanism/iterablemechanism.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/storage/mechanism/iterablemechanismtester.js b/src/module_vmap/module/javascript/test/unit/resource/goog/storage/mechanism/iterablemechanismtester.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/storage/mechanism/iterablemechanismtester.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/storage/mechanism/iterablemechanismtester.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/storage/mechanism/mechanism.js b/src/module_vmap/module/javascript/test/unit/resource/goog/storage/mechanism/mechanism.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/storage/mechanism/mechanism.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/storage/mechanism/mechanism.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/storage/mechanism/mechanismfactory.js b/src/module_vmap/module/javascript/test/unit/resource/goog/storage/mechanism/mechanismfactory.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/storage/mechanism/mechanismfactory.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/storage/mechanism/mechanismfactory.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/storage/mechanism/mechanismseparationtester.js b/src/module_vmap/module/javascript/test/unit/resource/goog/storage/mechanism/mechanismseparationtester.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/storage/mechanism/mechanismseparationtester.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/storage/mechanism/mechanismseparationtester.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/storage/mechanism/mechanismsharingtester.js b/src/module_vmap/module/javascript/test/unit/resource/goog/storage/mechanism/mechanismsharingtester.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/storage/mechanism/mechanismsharingtester.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/storage/mechanism/mechanismsharingtester.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/storage/mechanism/mechanismtestdefinition.js b/src/module_vmap/module/javascript/test/unit/resource/goog/storage/mechanism/mechanismtestdefinition.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/storage/mechanism/mechanismtestdefinition.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/storage/mechanism/mechanismtestdefinition.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/storage/mechanism/mechanismtester.js b/src/module_vmap/module/javascript/test/unit/resource/goog/storage/mechanism/mechanismtester.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/storage/mechanism/mechanismtester.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/storage/mechanism/mechanismtester.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/storage/mechanism/prefixedmechanism.js b/src/module_vmap/module/javascript/test/unit/resource/goog/storage/mechanism/prefixedmechanism.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/storage/mechanism/prefixedmechanism.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/storage/mechanism/prefixedmechanism.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/storage/richstorage.js b/src/module_vmap/module/javascript/test/unit/resource/goog/storage/richstorage.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/storage/richstorage.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/storage/richstorage.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/storage/storage.js b/src/module_vmap/module/javascript/test/unit/resource/goog/storage/storage.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/storage/storage.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/storage/storage.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/string/const.js b/src/module_vmap/module/javascript/test/unit/resource/goog/string/const.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/string/const.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/string/const.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/string/linkify.js b/src/module_vmap/module/javascript/test/unit/resource/goog/string/linkify.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/string/linkify.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/string/linkify.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/string/newlines.js b/src/module_vmap/module/javascript/test/unit/resource/goog/string/newlines.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/string/newlines.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/string/newlines.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/string/parser.js b/src/module_vmap/module/javascript/test/unit/resource/goog/string/parser.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/string/parser.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/string/parser.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/string/path.js b/src/module_vmap/module/javascript/test/unit/resource/goog/string/path.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/string/path.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/string/path.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/string/string.js b/src/module_vmap/module/javascript/test/unit/resource/goog/string/string.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/string/string.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/string/string.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/string/stringbuffer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/string/stringbuffer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/string/stringbuffer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/string/stringbuffer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/string/stringformat.js b/src/module_vmap/module/javascript/test/unit/resource/goog/string/stringformat.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/string/stringformat.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/string/stringformat.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/string/stringifier.js b/src/module_vmap/module/javascript/test/unit/resource/goog/string/stringifier.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/string/stringifier.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/string/stringifier.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/string/typedstring.js b/src/module_vmap/module/javascript/test/unit/resource/goog/string/typedstring.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/string/typedstring.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/string/typedstring.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/structs/avltree.js b/src/module_vmap/module/javascript/test/unit/resource/goog/structs/avltree.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/structs/avltree.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/structs/avltree.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/structs/circularbuffer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/structs/circularbuffer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/structs/circularbuffer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/structs/circularbuffer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/structs/collection.js b/src/module_vmap/module/javascript/test/unit/resource/goog/structs/collection.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/structs/collection.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/structs/collection.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/structs/heap.js b/src/module_vmap/module/javascript/test/unit/resource/goog/structs/heap.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/structs/heap.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/structs/heap.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/structs/inversionmap.js b/src/module_vmap/module/javascript/test/unit/resource/goog/structs/inversionmap.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/structs/inversionmap.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/structs/inversionmap.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/structs/linkedmap.js b/src/module_vmap/module/javascript/test/unit/resource/goog/structs/linkedmap.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/structs/linkedmap.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/structs/linkedmap.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/structs/map.js b/src/module_vmap/module/javascript/test/unit/resource/goog/structs/map.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/structs/map.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/structs/map.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/structs/node.js b/src/module_vmap/module/javascript/test/unit/resource/goog/structs/node.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/structs/node.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/structs/node.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/structs/pool.js b/src/module_vmap/module/javascript/test/unit/resource/goog/structs/pool.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/structs/pool.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/structs/pool.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/structs/prioritypool.js b/src/module_vmap/module/javascript/test/unit/resource/goog/structs/prioritypool.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/structs/prioritypool.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/structs/prioritypool.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/structs/priorityqueue.js b/src/module_vmap/module/javascript/test/unit/resource/goog/structs/priorityqueue.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/structs/priorityqueue.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/structs/priorityqueue.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/structs/quadtree.js b/src/module_vmap/module/javascript/test/unit/resource/goog/structs/quadtree.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/structs/quadtree.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/structs/quadtree.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/structs/queue.js b/src/module_vmap/module/javascript/test/unit/resource/goog/structs/queue.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/structs/queue.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/structs/queue.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/structs/set.js b/src/module_vmap/module/javascript/test/unit/resource/goog/structs/set.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/structs/set.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/structs/set.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/structs/simplepool.js b/src/module_vmap/module/javascript/test/unit/resource/goog/structs/simplepool.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/structs/simplepool.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/structs/simplepool.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/structs/stringset.js b/src/module_vmap/module/javascript/test/unit/resource/goog/structs/stringset.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/structs/stringset.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/structs/stringset.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/structs/structs.js b/src/module_vmap/module/javascript/test/unit/resource/goog/structs/structs.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/structs/structs.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/structs/structs.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/structs/treenode.js b/src/module_vmap/module/javascript/test/unit/resource/goog/structs/treenode.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/structs/treenode.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/structs/treenode.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/structs/trie.js b/src/module_vmap/module/javascript/test/unit/resource/goog/structs/trie.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/structs/trie.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/structs/trie.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/structs/weak/weak.js b/src/module_vmap/module/javascript/test/unit/resource/goog/structs/weak/weak.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/structs/weak/weak.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/structs/weak/weak.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/style/bidi.js b/src/module_vmap/module/javascript/test/unit/resource/goog/style/bidi.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/style/bidi.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/style/bidi.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/style/cursor.js b/src/module_vmap/module/javascript/test/unit/resource/goog/style/cursor.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/style/cursor.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/style/cursor.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/style/style.js b/src/module_vmap/module/javascript/test/unit/resource/goog/style/style.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/style/style.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/style/style.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/style/stylescrollbartester.js b/src/module_vmap/module/javascript/test/unit/resource/goog/style/stylescrollbartester.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/style/stylescrollbartester.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/style/stylescrollbartester.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/style/transform.js b/src/module_vmap/module/javascript/test/unit/resource/goog/style/transform.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/style/transform.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/style/transform.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/style/transition.js b/src/module_vmap/module/javascript/test/unit/resource/goog/style/transition.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/style/transition.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/style/transition.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/asserts.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/asserts.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/asserts.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/asserts.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/async/mockcontrol.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/async/mockcontrol.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/async/mockcontrol.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/async/mockcontrol.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/asynctestcase.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/asynctestcase.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/asynctestcase.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/asynctestcase.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/benchmark.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/benchmark.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/benchmark.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/benchmark.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/continuationtestcase.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/continuationtestcase.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/continuationtestcase.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/continuationtestcase.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/deferredtestcase.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/deferredtestcase.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/deferredtestcase.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/deferredtestcase.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/dom.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/dom.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/dom.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/dom.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/editor/dom.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/editor/dom.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/editor/dom.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/editor/dom.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/editor/fieldmock.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/editor/fieldmock.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/editor/fieldmock.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/editor/fieldmock.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/editor/testhelper.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/editor/testhelper.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/editor/testhelper.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/editor/testhelper.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/events/eventobserver.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/events/eventobserver.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/events/eventobserver.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/events/eventobserver.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/events/events.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/events/events.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/events/events.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/events/events.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/events/matchers.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/events/matchers.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/events/matchers.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/events/matchers.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/events/onlinehandler.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/events/onlinehandler.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/events/onlinehandler.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/events/onlinehandler.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/expectedfailures.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/expectedfailures.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/expectedfailures.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/expectedfailures.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/fs/blob.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/fs/blob.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/fs/blob.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/fs/blob.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/fs/entry.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/fs/entry.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/fs/entry.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/fs/entry.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/fs/file.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/fs/file.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/fs/file.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/fs/file.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/fs/filereader.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/fs/filereader.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/fs/filereader.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/fs/filereader.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/fs/filesystem.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/fs/filesystem.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/fs/filesystem.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/fs/filesystem.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/fs/filewriter.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/fs/filewriter.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/fs/filewriter.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/fs/filewriter.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/fs/fs.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/fs/fs.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/fs/fs.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/fs/fs.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/fs/progressevent.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/fs/progressevent.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/fs/progressevent.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/fs/progressevent.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/functionmock.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/functionmock.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/functionmock.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/functionmock.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/graphics.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/graphics.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/graphics.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/graphics.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/i18n/asserts.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/i18n/asserts.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/i18n/asserts.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/i18n/asserts.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/jsunit.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/jsunit.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/jsunit.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/jsunit.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/loosemock.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/loosemock.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/loosemock.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/loosemock.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/messaging/mockmessagechannel.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/messaging/mockmessagechannel.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/messaging/mockmessagechannel.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/messaging/mockmessagechannel.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/messaging/mockmessageevent.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/messaging/mockmessageevent.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/messaging/mockmessageevent.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/messaging/mockmessageevent.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/messaging/mockmessageport.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/messaging/mockmessageport.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/messaging/mockmessageport.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/messaging/mockmessageport.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/messaging/mockportnetwork.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/messaging/mockportnetwork.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/messaging/mockportnetwork.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/messaging/mockportnetwork.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/mock.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/mock.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/mock.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/mock.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/mockclassfactory.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/mockclassfactory.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/mockclassfactory.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/mockclassfactory.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/mockclock.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/mockclock.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/mockclock.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/mockclock.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/mockcontrol.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/mockcontrol.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/mockcontrol.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/mockcontrol.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/mockinterface.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/mockinterface.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/mockinterface.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/mockinterface.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/mockmatchers.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/mockmatchers.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/mockmatchers.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/mockmatchers.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/mockrandom.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/mockrandom.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/mockrandom.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/mockrandom.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/mockrange.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/mockrange.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/mockrange.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/mockrange.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/mockstorage.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/mockstorage.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/mockstorage.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/mockstorage.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/mockuseragent.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/mockuseragent.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/mockuseragent.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/mockuseragent.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/multitestrunner.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/multitestrunner.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/multitestrunner.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/multitestrunner.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/net/xhrio.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/net/xhrio.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/net/xhrio.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/net/xhrio.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/net/xhriopool.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/net/xhriopool.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/net/xhriopool.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/net/xhriopool.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/objectpropertystring.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/objectpropertystring.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/objectpropertystring.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/objectpropertystring.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/performancetable.css b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/performancetable.css
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/performancetable.css
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/performancetable.css
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/performancetable.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/performancetable.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/performancetable.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/performancetable.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/performancetimer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/performancetimer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/performancetimer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/performancetimer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/propertyreplacer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/propertyreplacer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/propertyreplacer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/propertyreplacer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/proto2/proto2.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/proto2/proto2.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/proto2/proto2.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/proto2/proto2.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/pseudorandom.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/pseudorandom.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/pseudorandom.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/pseudorandom.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/recordfunction.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/recordfunction.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/recordfunction.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/recordfunction.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/shardingtestcase.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/shardingtestcase.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/shardingtestcase.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/shardingtestcase.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/singleton.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/singleton.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/singleton.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/singleton.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/stacktrace.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/stacktrace.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/stacktrace.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/stacktrace.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/storage/fakemechanism.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/storage/fakemechanism.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/storage/fakemechanism.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/storage/fakemechanism.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/strictmock.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/strictmock.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/strictmock.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/strictmock.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/style/layoutasserts.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/style/layoutasserts.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/style/layoutasserts.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/style/layoutasserts.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/style/style.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/style/style.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/style/style.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/style/style.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/testcase.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/testcase.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/testcase.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/testcase.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/testqueue.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/testqueue.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/testqueue.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/testqueue.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/testrunner.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/testrunner.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/testrunner.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/testrunner.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/testsuite.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/testsuite.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/testsuite.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/testsuite.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/ui/rendererasserts.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/ui/rendererasserts.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/ui/rendererasserts.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/ui/rendererasserts.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/ui/rendererharness.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/ui/rendererharness.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/ui/rendererharness.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/ui/rendererharness.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/ui/style.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/ui/style.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/ui/style.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/ui/style.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/watchers.js b/src/module_vmap/module/javascript/test/unit/resource/goog/testing/watchers.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/testing/watchers.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/testing/watchers.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/third_party/caja/string/html/htmlparser.js b/src/module_vmap/module/javascript/test/unit/resource/goog/third_party/caja/string/html/htmlparser.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/third_party/caja/string/html/htmlparser.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/third_party/caja/string/html/htmlparser.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/third_party/caja/string/html/htmlsanitizer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/third_party/caja/string/html/htmlsanitizer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/third_party/caja/string/html/htmlsanitizer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/third_party/caja/string/html/htmlsanitizer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/third_party/dojo/dom/query.js b/src/module_vmap/module/javascript/test/unit/resource/goog/third_party/dojo/dom/query.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/third_party/dojo/dom/query.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/third_party/dojo/dom/query.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/third_party/jpeg_encoder/jpeg_encoder_basic.js b/src/module_vmap/module/javascript/test/unit/resource/goog/third_party/jpeg_encoder/jpeg_encoder_basic.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/third_party/jpeg_encoder/jpeg_encoder_basic.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/third_party/jpeg_encoder/jpeg_encoder_basic.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/third_party/loremipsum/text/loremipsum.js b/src/module_vmap/module/javascript/test/unit/resource/goog/third_party/loremipsum/text/loremipsum.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/third_party/loremipsum/text/loremipsum.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/third_party/loremipsum/text/loremipsum.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/third_party/mochikit/async/deferred.js b/src/module_vmap/module/javascript/test/unit/resource/goog/third_party/mochikit/async/deferred.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/third_party/mochikit/async/deferred.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/third_party/mochikit/async/deferred.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/third_party/mochikit/async/deferredlist.js b/src/module_vmap/module/javascript/test/unit/resource/goog/third_party/mochikit/async/deferredlist.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/third_party/mochikit/async/deferredlist.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/third_party/mochikit/async/deferredlist.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/third_party/osapi/osapi.js b/src/module_vmap/module/javascript/test/unit/resource/goog/third_party/osapi/osapi.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/third_party/osapi/osapi.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/third_party/osapi/osapi.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/third_party/svgpan/svgpan.js b/src/module_vmap/module/javascript/test/unit/resource/goog/third_party/svgpan/svgpan.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/third_party/svgpan/svgpan.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/third_party/svgpan/svgpan.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/timer/timer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/timer/timer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/timer/timer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/timer/timer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/tweak/entries.js b/src/module_vmap/module/javascript/test/unit/resource/goog/tweak/entries.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/tweak/entries.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/tweak/entries.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/tweak/registry.js b/src/module_vmap/module/javascript/test/unit/resource/goog/tweak/registry.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/tweak/registry.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/tweak/registry.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/tweak/testhelpers.js b/src/module_vmap/module/javascript/test/unit/resource/goog/tweak/testhelpers.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/tweak/testhelpers.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/tweak/testhelpers.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/tweak/tweak.js b/src/module_vmap/module/javascript/test/unit/resource/goog/tweak/tweak.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/tweak/tweak.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/tweak/tweak.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/tweak/tweakui.js b/src/module_vmap/module/javascript/test/unit/resource/goog/tweak/tweakui.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/tweak/tweakui.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/tweak/tweakui.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/abstractspellchecker.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/abstractspellchecker.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/abstractspellchecker.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/abstractspellchecker.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/ac/ac.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/ac/ac.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/ac/ac.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/ac/ac.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/ac/arraymatcher.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/ac/arraymatcher.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/ac/arraymatcher.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/ac/arraymatcher.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/ac/autocomplete.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/ac/autocomplete.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/ac/autocomplete.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/ac/autocomplete.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/ac/cachingmatcher.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/ac/cachingmatcher.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/ac/cachingmatcher.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/ac/cachingmatcher.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/ac/inputhandler.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/ac/inputhandler.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/ac/inputhandler.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/ac/inputhandler.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/ac/remote.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/ac/remote.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/ac/remote.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/ac/remote.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/ac/remotearraymatcher.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/ac/remotearraymatcher.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/ac/remotearraymatcher.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/ac/remotearraymatcher.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/ac/renderer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/ac/renderer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/ac/renderer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/ac/renderer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/ac/renderoptions.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/ac/renderoptions.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/ac/renderoptions.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/ac/renderoptions.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/ac/richinputhandler.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/ac/richinputhandler.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/ac/richinputhandler.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/ac/richinputhandler.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/ac/richremote.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/ac/richremote.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/ac/richremote.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/ac/richremote.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/ac/richremotearraymatcher.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/ac/richremotearraymatcher.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/ac/richremotearraymatcher.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/ac/richremotearraymatcher.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/activitymonitor.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/activitymonitor.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/activitymonitor.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/activitymonitor.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/advancedtooltip.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/advancedtooltip.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/advancedtooltip.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/advancedtooltip.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/animatedzippy.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/animatedzippy.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/animatedzippy.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/animatedzippy.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/attachablemenu.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/attachablemenu.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/attachablemenu.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/attachablemenu.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/bidiinput.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/bidiinput.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/bidiinput.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/bidiinput.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/bubble.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/bubble.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/bubble.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/bubble.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/button.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/button.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/button.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/button.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/buttonrenderer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/buttonrenderer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/buttonrenderer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/buttonrenderer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/buttonside.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/buttonside.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/buttonside.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/buttonside.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/charcounter.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/charcounter.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/charcounter.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/charcounter.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/charpicker.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/charpicker.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/charpicker.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/charpicker.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/checkbox.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/checkbox.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/checkbox.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/checkbox.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/checkboxmenuitem.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/checkboxmenuitem.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/checkboxmenuitem.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/checkboxmenuitem.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/checkboxrenderer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/checkboxrenderer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/checkboxrenderer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/checkboxrenderer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/colorbutton.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/colorbutton.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/colorbutton.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/colorbutton.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/colorbuttonrenderer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/colorbuttonrenderer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/colorbuttonrenderer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/colorbuttonrenderer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/colormenubutton.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/colormenubutton.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/colormenubutton.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/colormenubutton.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/colormenubuttonrenderer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/colormenubuttonrenderer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/colormenubuttonrenderer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/colormenubuttonrenderer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/colorpalette.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/colorpalette.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/colorpalette.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/colorpalette.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/colorpicker.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/colorpicker.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/colorpicker.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/colorpicker.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/colorsplitbehavior.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/colorsplitbehavior.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/colorsplitbehavior.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/colorsplitbehavior.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/combobox.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/combobox.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/combobox.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/combobox.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/component.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/component.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/component.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/component.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/container.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/container.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/container.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/container.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/containerrenderer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/containerrenderer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/containerrenderer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/containerrenderer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/containerscroller.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/containerscroller.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/containerscroller.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/containerscroller.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/control.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/control.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/control.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/control.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/controlcontent.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/controlcontent.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/controlcontent.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/controlcontent.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/controlrenderer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/controlrenderer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/controlrenderer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/controlrenderer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/cookieeditor.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/cookieeditor.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/cookieeditor.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/cookieeditor.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/css3buttonrenderer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/css3buttonrenderer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/css3buttonrenderer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/css3buttonrenderer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/css3menubuttonrenderer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/css3menubuttonrenderer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/css3menubuttonrenderer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/css3menubuttonrenderer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/cssnames.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/cssnames.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/cssnames.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/cssnames.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/custombutton.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/custombutton.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/custombutton.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/custombutton.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/custombuttonrenderer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/custombuttonrenderer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/custombuttonrenderer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/custombuttonrenderer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/customcolorpalette.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/customcolorpalette.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/customcolorpalette.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/customcolorpalette.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/datepicker.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/datepicker.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/datepicker.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/datepicker.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/datepickerrenderer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/datepickerrenderer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/datepickerrenderer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/datepickerrenderer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/decorate.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/decorate.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/decorate.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/decorate.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/defaultdatepickerrenderer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/defaultdatepickerrenderer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/defaultdatepickerrenderer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/defaultdatepickerrenderer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/dialog.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/dialog.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/dialog.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/dialog.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/dimensionpicker.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/dimensionpicker.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/dimensionpicker.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/dimensionpicker.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/dimensionpickerrenderer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/dimensionpickerrenderer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/dimensionpickerrenderer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/dimensionpickerrenderer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/dragdropdetector.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/dragdropdetector.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/dragdropdetector.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/dragdropdetector.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/drilldownrow.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/drilldownrow.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/drilldownrow.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/drilldownrow.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/editor/abstractdialog.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/editor/abstractdialog.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/editor/abstractdialog.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/editor/abstractdialog.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/editor/bubble.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/editor/bubble.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/editor/bubble.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/editor/bubble.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/editor/defaulttoolbar.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/editor/defaulttoolbar.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/editor/defaulttoolbar.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/editor/defaulttoolbar.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/editor/linkdialog.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/editor/linkdialog.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/editor/linkdialog.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/editor/linkdialog.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/editor/messages.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/editor/messages.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/editor/messages.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/editor/messages.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/editor/tabpane.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/editor/tabpane.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/editor/tabpane.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/editor/tabpane.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/editor/toolbarcontroller.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/editor/toolbarcontroller.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/editor/toolbarcontroller.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/editor/toolbarcontroller.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/editor/toolbarfactory.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/editor/toolbarfactory.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/editor/toolbarfactory.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/editor/toolbarfactory.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/emoji/emoji.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/emoji/emoji.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/emoji/emoji.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/emoji/emoji.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/emoji/emojipalette.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/emoji/emojipalette.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/emoji/emojipalette.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/emoji/emojipalette.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/emoji/emojipaletterenderer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/emoji/emojipaletterenderer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/emoji/emojipaletterenderer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/emoji/emojipaletterenderer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/emoji/emojipicker.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/emoji/emojipicker.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/emoji/emojipicker.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/emoji/emojipicker.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/emoji/popupemojipicker.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/emoji/popupemojipicker.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/emoji/popupemojipicker.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/emoji/popupemojipicker.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/emoji/progressiveemojipaletterenderer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/emoji/progressiveemojipaletterenderer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/emoji/progressiveemojipaletterenderer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/emoji/progressiveemojipaletterenderer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/emoji/spriteinfo.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/emoji/spriteinfo.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/emoji/spriteinfo.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/emoji/spriteinfo.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/filteredmenu.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/filteredmenu.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/filteredmenu.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/filteredmenu.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/filterobservingmenuitem.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/filterobservingmenuitem.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/filterobservingmenuitem.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/filterobservingmenuitem.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/filterobservingmenuitemrenderer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/filterobservingmenuitemrenderer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/filterobservingmenuitemrenderer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/filterobservingmenuitemrenderer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/flatbuttonrenderer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/flatbuttonrenderer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/flatbuttonrenderer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/flatbuttonrenderer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/flatmenubuttonrenderer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/flatmenubuttonrenderer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/flatmenubuttonrenderer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/flatmenubuttonrenderer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/formpost.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/formpost.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/formpost.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/formpost.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/gauge.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/gauge.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/gauge.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/gauge.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/gaugetheme.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/gaugetheme.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/gaugetheme.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/gaugetheme.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/hovercard.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/hovercard.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/hovercard.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/hovercard.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/hsvapalette.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/hsvapalette.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/hsvapalette.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/hsvapalette.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/hsvpalette.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/hsvpalette.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/hsvpalette.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/hsvpalette.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/idgenerator.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/idgenerator.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/idgenerator.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/idgenerator.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/idletimer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/idletimer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/idletimer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/idletimer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/iframemask.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/iframemask.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/iframemask.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/iframemask.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/imagelessbuttonrenderer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/imagelessbuttonrenderer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/imagelessbuttonrenderer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/imagelessbuttonrenderer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/imagelessmenubuttonrenderer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/imagelessmenubuttonrenderer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/imagelessmenubuttonrenderer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/imagelessmenubuttonrenderer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/inputdatepicker.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/inputdatepicker.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/inputdatepicker.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/inputdatepicker.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/itemevent.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/itemevent.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/itemevent.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/itemevent.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/keyboardshortcuthandler.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/keyboardshortcuthandler.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/keyboardshortcuthandler.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/keyboardshortcuthandler.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/labelinput.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/labelinput.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/labelinput.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/labelinput.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/linkbuttonrenderer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/linkbuttonrenderer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/linkbuttonrenderer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/linkbuttonrenderer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/media/flashobject.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/media/flashobject.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/media/flashobject.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/media/flashobject.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/media/flickr.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/media/flickr.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/media/flickr.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/media/flickr.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/media/googlevideo.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/media/googlevideo.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/media/googlevideo.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/media/googlevideo.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/media/media.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/media/media.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/media/media.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/media/media.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/media/mediamodel.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/media/mediamodel.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/media/mediamodel.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/media/mediamodel.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/media/mp3.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/media/mp3.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/media/mp3.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/media/mp3.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/media/photo.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/media/photo.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/media/photo.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/media/photo.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/media/picasa.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/media/picasa.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/media/picasa.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/media/picasa.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/media/vimeo.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/media/vimeo.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/media/vimeo.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/media/vimeo.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/media/youtube.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/media/youtube.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/media/youtube.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/media/youtube.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/menu.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/menu.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/menu.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/menu.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/menubar.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/menubar.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/menubar.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/menubar.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/menubardecorator.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/menubardecorator.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/menubardecorator.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/menubardecorator.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/menubarrenderer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/menubarrenderer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/menubarrenderer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/menubarrenderer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/menubase.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/menubase.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/menubase.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/menubase.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/menubutton.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/menubutton.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/menubutton.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/menubutton.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/menubuttonrenderer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/menubuttonrenderer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/menubuttonrenderer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/menubuttonrenderer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/menuheader.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/menuheader.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/menuheader.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/menuheader.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/menuheaderrenderer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/menuheaderrenderer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/menuheaderrenderer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/menuheaderrenderer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/menuitem.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/menuitem.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/menuitem.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/menuitem.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/menuitemrenderer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/menuitemrenderer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/menuitemrenderer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/menuitemrenderer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/menurenderer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/menurenderer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/menurenderer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/menurenderer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/menuseparator.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/menuseparator.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/menuseparator.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/menuseparator.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/menuseparatorrenderer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/menuseparatorrenderer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/menuseparatorrenderer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/menuseparatorrenderer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/mockactivitymonitor.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/mockactivitymonitor.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/mockactivitymonitor.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/mockactivitymonitor.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/modalpopup.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/modalpopup.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/modalpopup.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/modalpopup.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/nativebuttonrenderer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/nativebuttonrenderer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/nativebuttonrenderer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/nativebuttonrenderer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/option.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/option.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/option.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/option.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/palette.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/palette.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/palette.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/palette.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/paletterenderer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/paletterenderer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/paletterenderer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/paletterenderer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/plaintextspellchecker.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/plaintextspellchecker.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/plaintextspellchecker.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/plaintextspellchecker.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/popup.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/popup.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/popup.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/popup.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/popupbase.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/popupbase.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/popupbase.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/popupbase.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/popupcolorpicker.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/popupcolorpicker.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/popupcolorpicker.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/popupcolorpicker.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/popupdatepicker.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/popupdatepicker.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/popupdatepicker.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/popupdatepicker.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/popupmenu.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/popupmenu.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/popupmenu.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/popupmenu.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/progressbar.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/progressbar.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/progressbar.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/progressbar.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/prompt.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/prompt.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/prompt.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/prompt.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/rangemodel.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/rangemodel.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/rangemodel.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/rangemodel.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/ratings.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/ratings.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/ratings.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/ratings.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/registry.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/registry.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/registry.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/registry.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/richtextspellchecker.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/richtextspellchecker.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/richtextspellchecker.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/richtextspellchecker.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/roundedpanel.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/roundedpanel.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/roundedpanel.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/roundedpanel.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/roundedtabrenderer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/roundedtabrenderer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/roundedtabrenderer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/roundedtabrenderer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/scrollfloater.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/scrollfloater.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/scrollfloater.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/scrollfloater.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/select.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/select.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/select.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/select.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/selectionmenubutton.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/selectionmenubutton.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/selectionmenubutton.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/selectionmenubutton.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/selectionmodel.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/selectionmodel.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/selectionmodel.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/selectionmodel.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/separator.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/separator.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/separator.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/separator.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/serverchart.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/serverchart.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/serverchart.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/serverchart.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/slider.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/slider.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/slider.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/slider.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/sliderbase.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/sliderbase.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/sliderbase.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/sliderbase.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/splitbehavior.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/splitbehavior.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/splitbehavior.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/splitbehavior.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/splitpane.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/splitpane.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/splitpane.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/splitpane.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/style/app/buttonrenderer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/style/app/buttonrenderer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/style/app/buttonrenderer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/style/app/buttonrenderer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/style/app/menubuttonrenderer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/style/app/menubuttonrenderer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/style/app/menubuttonrenderer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/style/app/menubuttonrenderer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/style/app/primaryactionbuttonrenderer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/style/app/primaryactionbuttonrenderer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/style/app/primaryactionbuttonrenderer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/style/app/primaryactionbuttonrenderer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/submenu.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/submenu.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/submenu.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/submenu.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/submenurenderer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/submenurenderer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/submenurenderer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/submenurenderer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/tab.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/tab.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/tab.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/tab.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/tabbar.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/tabbar.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/tabbar.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/tabbar.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/tabbarrenderer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/tabbarrenderer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/tabbarrenderer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/tabbarrenderer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/tablesorter.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/tablesorter.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/tablesorter.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/tablesorter.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/tabpane.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/tabpane.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/tabpane.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/tabpane.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/tabrenderer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/tabrenderer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/tabrenderer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/tabrenderer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/textarea.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/textarea.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/textarea.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/textarea.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/textarearenderer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/textarearenderer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/textarearenderer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/textarearenderer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/togglebutton.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/togglebutton.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/togglebutton.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/togglebutton.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/toolbar.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/toolbar.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/toolbar.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/toolbar.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/toolbarbutton.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/toolbarbutton.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/toolbarbutton.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/toolbarbutton.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/toolbarbuttonrenderer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/toolbarbuttonrenderer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/toolbarbuttonrenderer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/toolbarbuttonrenderer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/toolbarcolormenubutton.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/toolbarcolormenubutton.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/toolbarcolormenubutton.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/toolbarcolormenubutton.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/toolbarcolormenubuttonrenderer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/toolbarcolormenubuttonrenderer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/toolbarcolormenubuttonrenderer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/toolbarcolormenubuttonrenderer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/toolbarmenubutton.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/toolbarmenubutton.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/toolbarmenubutton.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/toolbarmenubutton.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/toolbarmenubuttonrenderer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/toolbarmenubuttonrenderer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/toolbarmenubuttonrenderer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/toolbarmenubuttonrenderer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/toolbarrenderer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/toolbarrenderer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/toolbarrenderer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/toolbarrenderer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/toolbarselect.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/toolbarselect.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/toolbarselect.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/toolbarselect.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/toolbarseparator.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/toolbarseparator.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/toolbarseparator.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/toolbarseparator.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/toolbarseparatorrenderer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/toolbarseparatorrenderer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/toolbarseparatorrenderer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/toolbarseparatorrenderer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/toolbartogglebutton.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/toolbartogglebutton.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/toolbartogglebutton.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/toolbartogglebutton.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/tooltip.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/tooltip.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/tooltip.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/tooltip.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/tree/basenode.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/tree/basenode.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/tree/basenode.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/tree/basenode.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/tree/treecontrol.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/tree/treecontrol.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/tree/treecontrol.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/tree/treecontrol.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/tree/treenode.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/tree/treenode.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/tree/treenode.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/tree/treenode.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/tree/typeahead.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/tree/typeahead.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/tree/typeahead.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/tree/typeahead.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/tristatemenuitem.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/tristatemenuitem.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/tristatemenuitem.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/tristatemenuitem.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/tristatemenuitemrenderer.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/tristatemenuitemrenderer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/tristatemenuitemrenderer.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/tristatemenuitemrenderer.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/twothumbslider.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/twothumbslider.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/twothumbslider.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/twothumbslider.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/zippy.js b/src/module_vmap/module/javascript/test/unit/resource/goog/ui/zippy.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/ui/zippy.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/ui/zippy.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/uri/uri.js b/src/module_vmap/module/javascript/test/unit/resource/goog/uri/uri.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/uri/uri.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/uri/uri.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/uri/utils.js b/src/module_vmap/module/javascript/test/unit/resource/goog/uri/utils.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/uri/utils.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/uri/utils.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/useragent/adobereader.js b/src/module_vmap/module/javascript/test/unit/resource/goog/useragent/adobereader.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/useragent/adobereader.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/useragent/adobereader.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/useragent/flash.js b/src/module_vmap/module/javascript/test/unit/resource/goog/useragent/flash.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/useragent/flash.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/useragent/flash.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/useragent/iphoto.js b/src/module_vmap/module/javascript/test/unit/resource/goog/useragent/iphoto.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/useragent/iphoto.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/useragent/iphoto.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/useragent/jscript.js b/src/module_vmap/module/javascript/test/unit/resource/goog/useragent/jscript.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/useragent/jscript.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/useragent/jscript.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/useragent/keyboard.js b/src/module_vmap/module/javascript/test/unit/resource/goog/useragent/keyboard.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/useragent/keyboard.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/useragent/keyboard.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/useragent/picasa.js b/src/module_vmap/module/javascript/test/unit/resource/goog/useragent/picasa.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/useragent/picasa.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/useragent/picasa.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/useragent/platform.js b/src/module_vmap/module/javascript/test/unit/resource/goog/useragent/platform.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/useragent/platform.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/useragent/platform.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/useragent/product.js b/src/module_vmap/module/javascript/test/unit/resource/goog/useragent/product.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/useragent/product.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/useragent/product.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/useragent/product_isversion.js b/src/module_vmap/module/javascript/test/unit/resource/goog/useragent/product_isversion.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/useragent/product_isversion.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/useragent/product_isversion.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/useragent/useragent.js b/src/module_vmap/module/javascript/test/unit/resource/goog/useragent/useragent.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/useragent/useragent.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/useragent/useragent.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/useragent/useragenttestutil.js b/src/module_vmap/module/javascript/test/unit/resource/goog/useragent/useragenttestutil.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/useragent/useragenttestutil.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/useragent/useragenttestutil.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/vec/float32array.js b/src/module_vmap/module/javascript/test/unit/resource/goog/vec/float32array.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/vec/float32array.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/vec/float32array.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/vec/float64array.js b/src/module_vmap/module/javascript/test/unit/resource/goog/vec/float64array.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/vec/float64array.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/vec/float64array.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/vec/mat3.js b/src/module_vmap/module/javascript/test/unit/resource/goog/vec/mat3.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/vec/mat3.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/vec/mat3.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/vec/mat3d.js b/src/module_vmap/module/javascript/test/unit/resource/goog/vec/mat3d.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/vec/mat3d.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/vec/mat3d.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/vec/mat3f.js b/src/module_vmap/module/javascript/test/unit/resource/goog/vec/mat3f.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/vec/mat3f.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/vec/mat3f.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/vec/mat4.js b/src/module_vmap/module/javascript/test/unit/resource/goog/vec/mat4.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/vec/mat4.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/vec/mat4.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/vec/mat4d.js b/src/module_vmap/module/javascript/test/unit/resource/goog/vec/mat4d.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/vec/mat4d.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/vec/mat4d.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/vec/mat4f.js b/src/module_vmap/module/javascript/test/unit/resource/goog/vec/mat4f.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/vec/mat4f.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/vec/mat4f.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/vec/matrix3.js b/src/module_vmap/module/javascript/test/unit/resource/goog/vec/matrix3.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/vec/matrix3.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/vec/matrix3.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/vec/matrix4.js b/src/module_vmap/module/javascript/test/unit/resource/goog/vec/matrix4.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/vec/matrix4.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/vec/matrix4.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/vec/quaternion.js b/src/module_vmap/module/javascript/test/unit/resource/goog/vec/quaternion.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/vec/quaternion.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/vec/quaternion.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/vec/ray.js b/src/module_vmap/module/javascript/test/unit/resource/goog/vec/ray.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/vec/ray.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/vec/ray.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/vec/vec.js b/src/module_vmap/module/javascript/test/unit/resource/goog/vec/vec.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/vec/vec.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/vec/vec.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/vec/vec2.js b/src/module_vmap/module/javascript/test/unit/resource/goog/vec/vec2.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/vec/vec2.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/vec/vec2.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/vec/vec2d.js b/src/module_vmap/module/javascript/test/unit/resource/goog/vec/vec2d.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/vec/vec2d.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/vec/vec2d.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/vec/vec2f.js b/src/module_vmap/module/javascript/test/unit/resource/goog/vec/vec2f.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/vec/vec2f.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/vec/vec2f.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/vec/vec3.js b/src/module_vmap/module/javascript/test/unit/resource/goog/vec/vec3.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/vec/vec3.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/vec/vec3.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/vec/vec3d.js b/src/module_vmap/module/javascript/test/unit/resource/goog/vec/vec3d.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/vec/vec3d.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/vec/vec3d.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/vec/vec3f.js b/src/module_vmap/module/javascript/test/unit/resource/goog/vec/vec3f.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/vec/vec3f.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/vec/vec3f.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/vec/vec4.js b/src/module_vmap/module/javascript/test/unit/resource/goog/vec/vec4.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/vec/vec4.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/vec/vec4.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/vec/vec4d.js b/src/module_vmap/module/javascript/test/unit/resource/goog/vec/vec4d.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/vec/vec4d.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/vec/vec4d.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/vec/vec4f.js b/src/module_vmap/module/javascript/test/unit/resource/goog/vec/vec4f.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/vec/vec4f.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/vec/vec4f.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/webgl/webgl.js b/src/module_vmap/module/javascript/test/unit/resource/goog/webgl/webgl.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/webgl/webgl.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/webgl/webgl.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/resource/goog/window/window.js b/src/module_vmap/module/javascript/test/unit/resource/goog/window/window.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/resource/goog/window/window.js
rename to src/module_vmap/module/javascript/test/unit/resource/goog/window/window.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/src/map/map.inte.js b/src/module_vmap/module/javascript/test/unit/src/map/map.inte.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/src/map/map.inte.js
rename to src/module_vmap/module/javascript/test/unit/src/map/map.inte.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/src/map/map.spec.js b/src/module_vmap/module/javascript/test/unit/src/map/map.spec.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/src/map/map.spec.js
rename to src/module_vmap/module/javascript/test/unit/src/map/map.spec.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/src/mapmanager/layersorder.spec.js b/src/module_vmap/module/javascript/test/unit/src/mapmanager/layersorder.spec.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/src/mapmanager/layersorder.spec.js
rename to src/module_vmap/module/javascript/test/unit/src/mapmanager/layersorder.spec.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/src/mapmanager/layerstree.spec.js b/src/module_vmap/module/javascript/test/unit/src/mapmanager/layerstree.spec.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/src/mapmanager/layerstree.spec.js
rename to src/module_vmap/module/javascript/test/unit/src/mapmanager/layerstree.spec.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/src/mapmanager/maplegend.spec.js b/src/module_vmap/module/javascript/test/unit/src/mapmanager/maplegend.spec.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/src/mapmanager/maplegend.spec.js
rename to src/module_vmap/module/javascript/test/unit/src/mapmanager/maplegend.spec.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/src/mapmanager/mapmanager.inte.js b/src/module_vmap/module/javascript/test/unit/src/mapmanager/mapmanager.inte.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/src/mapmanager/mapmanager.inte.js
rename to src/module_vmap/module/javascript/test/unit/src/mapmanager/mapmanager.inte.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/src/mapmanager/mapmanager.spec.js b/src/module_vmap/module/javascript/test/unit/src/mapmanager/mapmanager.spec.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/src/mapmanager/mapmanager.spec.js
rename to src/module_vmap/module/javascript/test/unit/src/mapmanager/mapmanager.spec.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/src/mapmanager/mapmodal/bingsuggestion.spec.js b/src/module_vmap/module/javascript/test/unit/src/mapmanager/mapmodal/bingsuggestion.spec.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/src/mapmanager/mapmodal/bingsuggestion.spec.js
rename to src/module_vmap/module/javascript/test/unit/src/mapmanager/mapmodal/bingsuggestion.spec.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/src/mapmanager/mapmodal/ignsuggestions.spec.js b/src/module_vmap/module/javascript/test/unit/src/mapmanager/mapmodal/ignsuggestions.spec.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/src/mapmanager/mapmodal/ignsuggestions.spec.js
rename to src/module_vmap/module/javascript/test/unit/src/mapmanager/mapmodal/ignsuggestions.spec.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/src/mapmanager/mapmodal/loadgeometry.spec.js b/src/module_vmap/module/javascript/test/unit/src/mapmanager/mapmodal/loadgeometry.spec.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/src/mapmanager/mapmodal/loadgeometry.spec.js
rename to src/module_vmap/module/javascript/test/unit/src/mapmanager/mapmodal/loadgeometry.spec.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/src/mapmanager/mapmodal/maplist.spec.js b/src/module_vmap/module/javascript/test/unit/src/mapmanager/mapmodal/maplist.spec.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/src/mapmanager/mapmodal/maplist.spec.js
rename to src/module_vmap/module/javascript/test/unit/src/mapmanager/mapmodal/maplist.spec.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/src/mapmanager/mapmodal/mapmodal.inte.js b/src/module_vmap/module/javascript/test/unit/src/mapmanager/mapmodal/mapmodal.inte.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/src/mapmanager/mapmodal/mapmodal.inte.js
rename to src/module_vmap/module/javascript/test/unit/src/mapmanager/mapmodal/mapmodal.inte.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/src/mapmanager/mapmodal/mapmodal.spec.js b/src/module_vmap/module/javascript/test/unit/src/mapmanager/mapmodal/mapmodal.spec.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/src/mapmanager/mapmodal/mapmodal.spec.js
rename to src/module_vmap/module/javascript/test/unit/src/mapmanager/mapmodal/mapmodal.spec.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/src/mapmanager/mapmodal/mymap.spec.js b/src/module_vmap/module/javascript/test/unit/src/mapmanager/mapmodal/mymap.spec.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/src/mapmanager/mapmodal/mymap.spec.js
rename to src/module_vmap/module/javascript/test/unit/src/mapmanager/mapmodal/mymap.spec.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/src/mapmanager/mapmodal/osmsuggestion.spec.js b/src/module_vmap/module/javascript/test/unit/src/mapmanager/mapmodal/osmsuggestion.spec.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/src/mapmanager/mapmodal/osmsuggestion.spec.js
rename to src/module_vmap/module/javascript/test/unit/src/mapmanager/mapmodal/osmsuggestion.spec.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/src/mapmanager/mapmodal/wfssuggestions.spec.js b/src/module_vmap/module/javascript/test/unit/src/mapmanager/mapmodal/wfssuggestions.spec.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/src/mapmanager/mapmodal/wfssuggestions.spec.js
rename to src/module_vmap/module/javascript/test/unit/src/mapmanager/mapmodal/wfssuggestions.spec.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/src/mapmanager/mapmodal/wmssuggestions.spec.js b/src/module_vmap/module/javascript/test/unit/src/mapmanager/mapmodal/wmssuggestions.spec.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/src/mapmanager/mapmodal/wmssuggestions.spec.js
rename to src/module_vmap/module/javascript/test/unit/src/mapmanager/mapmodal/wmssuggestions.spec.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/src/tools/basictools.inte.js b/src/module_vmap/module/javascript/test/unit/src/tools/basictools.inte.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/src/tools/basictools.inte.js
rename to src/module_vmap/module/javascript/test/unit/src/tools/basictools.inte.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/src/tools/basictools.spec.js b/src/module_vmap/module/javascript/test/unit/src/tools/basictools.spec.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/src/tools/basictools.spec.js
rename to src/module_vmap/module/javascript/test/unit/src/tools/basictools.spec.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/src/tools/controls.inte.js b/src/module_vmap/module/javascript/test/unit/src/tools/controls.inte.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/src/tools/controls.inte.js
rename to src/module_vmap/module/javascript/test/unit/src/tools/controls.inte.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/src/tools/controls.spec.js b/src/module_vmap/module/javascript/test/unit/src/tools/controls.spec.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/src/tools/controls.spec.js
rename to src/module_vmap/module/javascript/test/unit/src/tools/controls.spec.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/src/tools/draw.inte.js b/src/module_vmap/module/javascript/test/unit/src/tools/draw.inte.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/src/tools/draw.inte.js
rename to src/module_vmap/module/javascript/test/unit/src/tools/draw.inte.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/src/tools/draw.spec.js b/src/module_vmap/module/javascript/test/unit/src/tools/draw.spec.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/src/tools/draw.spec.js
rename to src/module_vmap/module/javascript/test/unit/src/tools/draw.spec.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/src/tools/location.spec.js b/src/module_vmap/module/javascript/test/unit/src/tools/location.spec.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/src/tools/location.spec.js
rename to src/module_vmap/module/javascript/test/unit/src/tools/location.spec.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/src/tools/measure.inte.js b/src/module_vmap/module/javascript/test/unit/src/tools/measure.inte.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/src/tools/measure.inte.js
rename to src/module_vmap/module/javascript/test/unit/src/tools/measure.inte.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/src/tools/measure.spec.js b/src/module_vmap/module/javascript/test/unit/src/tools/measure.spec.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/src/tools/measure.spec.js
rename to src/module_vmap/module/javascript/test/unit/src/tools/measure.spec.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/src/tools/select.inte.js b/src/module_vmap/module/javascript/test/unit/src/tools/select.inte.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/src/tools/select.inte.js
rename to src/module_vmap/module/javascript/test/unit/src/tools/select.inte.js
diff --git a/vmap/client/modules/vmap/javascript/test/unit/src/tools/select.spec.js b/src/module_vmap/module/javascript/test/unit/src/tools/select.spec.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/unit/src/tools/select.spec.js
rename to src/module_vmap/module/javascript/test/unit/src/tools/select.spec.js
diff --git a/vmap/client/modules/vmap/javascript/vitis/controllers/documentationHelpCtrl.js b/src/module_vmap/module/javascript/vitis/controllers/documentationHelpCtrl.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/vitis/controllers/documentationHelpCtrl.js
rename to src/module_vmap/module/javascript/vitis/controllers/documentationHelpCtrl.js
diff --git a/vmap/client/modules/vmap/javascript/vitis/controllers/exportVexCtrl.js b/src/module_vmap/module/javascript/vitis/controllers/exportVexCtrl.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/vitis/controllers/exportVexCtrl.js
rename to src/module_vmap/module/javascript/vitis/controllers/exportVexCtrl.js
diff --git a/vmap/client/modules/vmap/javascript/vitis/controllers/importVexCtrl.js b/src/module_vmap/module/javascript/vitis/controllers/importVexCtrl.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/vitis/controllers/importVexCtrl.js
rename to src/module_vmap/module/javascript/vitis/controllers/importVexCtrl.js
diff --git a/vmap/client/modules/vmap/javascript/vitis/directives/documentationHelpDrtv.js b/src/module_vmap/module/javascript/vitis/directives/documentationHelpDrtv.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/vitis/directives/documentationHelpDrtv.js
rename to src/module_vmap/module/javascript/vitis/directives/documentationHelpDrtv.js
diff --git a/vmap/client/modules/vmap/javascript/vitis/directives/exportVexDrtv.js b/src/module_vmap/module/javascript/vitis/directives/exportVexDrtv.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/vitis/directives/exportVexDrtv.js
rename to src/module_vmap/module/javascript/vitis/directives/exportVexDrtv.js
diff --git a/vmap/client/modules/vmap/javascript/vitis/directives/importVexDrtv.js b/src/module_vmap/module/javascript/vitis/directives/importVexDrtv.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/vitis/directives/importVexDrtv.js
rename to src/module_vmap/module/javascript/vitis/directives/importVexDrtv.js
diff --git a/vmap/client/modules/vmap/javascript/vitis/script_module.js b/src/module_vmap/module/javascript/vitis/script_module.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/vitis/script_module.js
rename to src/module_vmap/module/javascript/vitis/script_module.js
diff --git a/vmap/client/modules/vmap/lang/lang-en.json b/src/module_vmap/module/lang/lang-en.json
similarity index 100%
rename from vmap/client/modules/vmap/lang/lang-en.json
rename to src/module_vmap/module/lang/lang-en.json
diff --git a/vmap/client/modules/vmap/lang/lang-fr.json b/src/module_vmap/module/lang/lang-fr.json
similarity index 100%
rename from vmap/client/modules/vmap/lang/lang-fr.json
rename to src/module_vmap/module/lang/lang-fr.json
diff --git a/vmap/client/modules/vmap/less/main.less b/src/module_vmap/module/less/main.less
similarity index 100%
rename from vmap/client/modules/vmap/less/main.less
rename to src/module_vmap/module/less/main.less
diff --git a/vmap/client/modules/vmap/less/map.less b/src/module_vmap/module/less/map.less
similarity index 100%
rename from vmap/client/modules/vmap/less/map.less
rename to src/module_vmap/module/less/map.less
diff --git a/vmap/client/modules/vmap/template/layers/layersorder.html b/src/module_vmap/module/template/layers/layersorder.html
similarity index 100%
rename from vmap/client/modules/vmap/template/layers/layersorder.html
rename to src/module_vmap/module/template/layers/layersorder.html
diff --git a/vmap/client/modules/vmap/template/layers/layertree.html b/src/module_vmap/module/template/layers/layertree.html
similarity index 100%
rename from vmap/client/modules/vmap/template/layers/layertree.html
rename to src/module_vmap/module/template/layers/layertree.html
diff --git a/vmap/client/modules/vmap/template/layers/maplegend.html b/src/module_vmap/module/template/layers/maplegend.html
similarity index 100%
rename from vmap/client/modules/vmap/template/layers/maplegend.html
rename to src/module_vmap/module/template/layers/maplegend.html
diff --git a/vmap/client/modules/vmap/template/layers/mapmodal/bingsuggestions.html b/src/module_vmap/module/template/layers/mapmodal/bingsuggestions.html
similarity index 100%
rename from vmap/client/modules/vmap/template/layers/mapmodal/bingsuggestions.html
rename to src/module_vmap/module/template/layers/mapmodal/bingsuggestions.html
diff --git a/vmap/client/modules/vmap/template/layers/mapmodal/loadgeometry.html b/src/module_vmap/module/template/layers/mapmodal/loadgeometry.html
similarity index 100%
rename from vmap/client/modules/vmap/template/layers/mapmodal/loadgeometry.html
rename to src/module_vmap/module/template/layers/mapmodal/loadgeometry.html
diff --git a/vmap/client/modules/vmap/template/layers/mapmodal/maplist.html b/src/module_vmap/module/template/layers/mapmodal/maplist.html
similarity index 100%
rename from vmap/client/modules/vmap/template/layers/mapmodal/maplist.html
rename to src/module_vmap/module/template/layers/mapmodal/maplist.html
diff --git a/vmap/client/modules/vmap/template/layers/mapmodal/maplistlitle.html b/src/module_vmap/module/template/layers/mapmodal/maplistlitle.html
similarity index 100%
rename from vmap/client/modules/vmap/template/layers/mapmodal/maplistlitle.html
rename to src/module_vmap/module/template/layers/mapmodal/maplistlitle.html
diff --git a/vmap/client/modules/vmap/template/layers/mapmodal/maplistlitle_mobile.html b/src/module_vmap/module/template/layers/mapmodal/maplistlitle_mobile.html
similarity index 100%
rename from vmap/client/modules/vmap/template/layers/mapmodal/maplistlitle_mobile.html
rename to src/module_vmap/module/template/layers/mapmodal/maplistlitle_mobile.html
diff --git a/vmap/client/modules/vmap/template/layers/mapmodal/mapmodal.html b/src/module_vmap/module/template/layers/mapmodal/mapmodal.html
similarity index 100%
rename from vmap/client/modules/vmap/template/layers/mapmodal/mapmodal.html
rename to src/module_vmap/module/template/layers/mapmodal/mapmodal.html
diff --git a/vmap/client/modules/vmap/template/layers/mapmodal/mymap.html b/src/module_vmap/module/template/layers/mapmodal/mymap.html
similarity index 100%
rename from vmap/client/modules/vmap/template/layers/mapmodal/mymap.html
rename to src/module_vmap/module/template/layers/mapmodal/mymap.html
diff --git a/vmap/client/modules/vmap/template/layers/mapmodal/osmsuggestions.html b/src/module_vmap/module/template/layers/mapmodal/osmsuggestions.html
similarity index 100%
rename from vmap/client/modules/vmap/template/layers/mapmodal/osmsuggestions.html
rename to src/module_vmap/module/template/layers/mapmodal/osmsuggestions.html
diff --git a/vmap/client/modules/vmap/template/layers/mapmodal/wmssuggestions.html b/src/module_vmap/module/template/layers/mapmodal/wmssuggestions.html
similarity index 100%
rename from vmap/client/modules/vmap/template/layers/mapmodal/wmssuggestions.html
rename to src/module_vmap/module/template/layers/mapmodal/wmssuggestions.html
diff --git a/vmap/client/modules/vmap/template/layers/mapmodal/wmtssuggestions.html b/src/module_vmap/module/template/layers/mapmodal/wmtssuggestions.html
similarity index 100%
rename from vmap/client/modules/vmap/template/layers/mapmodal/wmtssuggestions.html
rename to src/module_vmap/module/template/layers/mapmodal/wmtssuggestions.html
diff --git a/vmap/client/modules/vmap/template/layers/mapmodal/xyzsuggestions.html b/src/module_vmap/module/template/layers/mapmodal/xyzsuggestions.html
similarity index 100%
rename from vmap/client/modules/vmap/template/layers/mapmodal/xyzsuggestions.html
rename to src/module_vmap/module/template/layers/mapmodal/xyzsuggestions.html
diff --git a/vmap/client/modules/vmap/template/map/map.html b/src/module_vmap/module/template/map/map.html
similarity index 100%
rename from vmap/client/modules/vmap/template/map/map.html
rename to src/module_vmap/module/template/map/map.html
diff --git a/vmap/client/modules/vmap/template/modules/cadastre.html b/src/module_vmap/module/template/modules/cadastre.html
similarity index 100%
rename from vmap/client/modules/vmap/template/modules/cadastre.html
rename to src/module_vmap/module/template/modules/cadastre.html
diff --git a/vmap/client/modules/vmap/template/modules/draw.html b/src/module_vmap/module/template/modules/draw.html
similarity index 100%
rename from vmap/client/modules/vmap/template/modules/draw.html
rename to src/module_vmap/module/template/modules/draw.html
diff --git a/vmap/client/modules/vmap/template/studio.html b/src/module_vmap/module/template/studio.html
similarity index 100%
rename from vmap/client/modules/vmap/template/studio.html
rename to src/module_vmap/module/template/studio.html
diff --git a/vmap/client/modules/vmap/template/tools/advancedselect.html b/src/module_vmap/module/template/tools/advancedselect.html
similarity index 100%
rename from vmap/client/modules/vmap/template/tools/advancedselect.html
rename to src/module_vmap/module/template/tools/advancedselect.html
diff --git a/vmap/client/modules/vmap/template/tools/advancedselect_mobile.html b/src/module_vmap/module/template/tools/advancedselect_mobile.html
similarity index 100%
rename from vmap/client/modules/vmap/template/tools/advancedselect_mobile.html
rename to src/module_vmap/module/template/tools/advancedselect_mobile.html
diff --git a/vmap/client/modules/vmap/template/tools/basicselect.html b/src/module_vmap/module/template/tools/basicselect.html
similarity index 100%
rename from vmap/client/modules/vmap/template/tools/basicselect.html
rename to src/module_vmap/module/template/tools/basicselect.html
diff --git a/vmap/client/modules/vmap/template/tools/basictools.html b/src/module_vmap/module/template/tools/basictools.html
similarity index 100%
rename from vmap/client/modules/vmap/template/tools/basictools.html
rename to src/module_vmap/module/template/tools/basictools.html
diff --git a/vmap/client/modules/vmap/template/tools/basictools_mobile.html b/src/module_vmap/module/template/tools/basictools_mobile.html
similarity index 100%
rename from vmap/client/modules/vmap/template/tools/basictools_mobile.html
rename to src/module_vmap/module/template/tools/basictools_mobile.html
diff --git a/vmap/client/modules/vmap/template/tools/controls.html b/src/module_vmap/module/template/tools/controls.html
similarity index 100%
rename from vmap/client/modules/vmap/template/tools/controls.html
rename to src/module_vmap/module/template/tools/controls.html
diff --git a/vmap/client/modules/vmap/template/tools/infocontainer.html b/src/module_vmap/module/template/tools/infocontainer.html
similarity index 100%
rename from vmap/client/modules/vmap/template/tools/infocontainer.html
rename to src/module_vmap/module/template/tools/infocontainer.html
diff --git a/vmap/client/modules/vmap/template/tools/insert.html b/src/module_vmap/module/template/tools/insert.html
similarity index 100%
rename from vmap/client/modules/vmap/template/tools/insert.html
rename to src/module_vmap/module/template/tools/insert.html
diff --git a/vmap/client/modules/vmap/template/tools/insert_mobile.html b/src/module_vmap/module/template/tools/insert_mobile.html
similarity index 100%
rename from vmap/client/modules/vmap/template/tools/insert_mobile.html
rename to src/module_vmap/module/template/tools/insert_mobile.html
diff --git a/vmap/client/modules/vmap/template/tools/location.html b/src/module_vmap/module/template/tools/location.html
similarity index 100%
rename from vmap/client/modules/vmap/template/tools/location.html
rename to src/module_vmap/module/template/tools/location.html
diff --git a/vmap/client/modules/vmap/template/tools/location_mobile.html b/src/module_vmap/module/template/tools/location_mobile.html
similarity index 100%
rename from vmap/client/modules/vmap/template/tools/location_mobile.html
rename to src/module_vmap/module/template/tools/location_mobile.html
diff --git a/vmap/client/modules/vmap/template/tools/measure.html b/src/module_vmap/module/template/tools/measure.html
similarity index 100%
rename from vmap/client/modules/vmap/template/tools/measure.html
rename to src/module_vmap/module/template/tools/measure.html
diff --git a/vmap/client/modules/vmap/template/tools/measure_mobile.html b/src/module_vmap/module/template/tools/measure_mobile.html
similarity index 100%
rename from vmap/client/modules/vmap/template/tools/measure_mobile.html
rename to src/module_vmap/module/template/tools/measure_mobile.html
diff --git a/vmap/client/modules/vmap/template/tools/print.html b/src/module_vmap/module/template/tools/print.html
similarity index 100%
rename from vmap/client/modules/vmap/template/tools/print.html
rename to src/module_vmap/module/template/tools/print.html
diff --git a/vmap/client/modules/vmap/template/tools/select.html b/src/module_vmap/module/template/tools/select.html
similarity index 100%
rename from vmap/client/modules/vmap/template/tools/select.html
rename to src/module_vmap/module/template/tools/select.html
diff --git a/vmap/client/modules/vmap/template/tools/selection-info.html b/src/module_vmap/module/template/tools/selection-info.html
similarity index 100%
rename from vmap/client/modules/vmap/template/tools/selection-info.html
rename to src/module_vmap/module/template/tools/selection-info.html
diff --git a/vmap/client/modules/vmap/template/tools/tools.html b/src/module_vmap/module/template/tools/tools.html
similarity index 100%
rename from vmap/client/modules/vmap/template/tools/tools.html
rename to src/module_vmap/module/template/tools/tools.html
diff --git a/vmap/client/modules/vmap/template/tools/user.html b/src/module_vmap/module/template/tools/user.html
similarity index 100%
rename from vmap/client/modules/vmap/template/tools/user.html
rename to src/module_vmap/module/template/tools/user.html
diff --git a/vmap/client/modules/vmap/template/tools/user_mobile.html b/src/module_vmap/module/template/tools/user_mobile.html
similarity index 100%
rename from vmap/client/modules/vmap/template/tools/user_mobile.html
rename to src/module_vmap/module/template/tools/user_mobile.html
diff --git a/vmap/client/modules/vmap/template/vitis/documentationHelpTpl.html b/src/module_vmap/module/template/vitis/documentationHelpTpl.html
similarity index 100%
rename from vmap/client/modules/vmap/template/vitis/documentationHelpTpl.html
rename to src/module_vmap/module/template/vitis/documentationHelpTpl.html
diff --git a/vmap/client/modules/vmap/template/vitis/exportVex.html b/src/module_vmap/module/template/vitis/exportVex.html
similarity index 100%
rename from vmap/client/modules/vmap/template/vitis/exportVex.html
rename to src/module_vmap/module/template/vitis/exportVex.html
diff --git a/vmap/client/modules/vmap/template/vitis/importVex.html b/src/module_vmap/module/template/vitis/importVex.html
similarity index 100%
rename from vmap/client/modules/vmap/template/vitis/importVex.html
rename to src/module_vmap/module/template/vitis/importVex.html
diff --git a/vmap/client/modules/vmap/template/vitis/serviceLayers.html b/src/module_vmap/module/template/vitis/serviceLayers.html
similarity index 100%
rename from vmap/client/modules/vmap/template/vitis/serviceLayers.html
rename to src/module_vmap/module/template/vitis/serviceLayers.html
diff --git a/vmap/client/modules/vmap/template/vmap.html b/src/module_vmap/module/template/vmap.html
similarity index 100%
rename from vmap/client/modules/vmap/template/vmap.html
rename to src/module_vmap/module/template/vmap.html
diff --git a/src/module_vmap/web_service/CHANGE_LOG.txt b/src/module_vmap/web_service/CHANGE_LOG.txt
new file mode 100755
index 0000000000000000000000000000000000000000..ece12f0f6ea4006e4a9ad4087990a09a922ac5e4
--- /dev/null
+++ b/src/module_vmap/web_service/CHANGE_LOG.txt
@@ -0,0 +1,188 @@
+b23245|EVOLUTION	|vmap|	Poperties sans commentaires
+b23139|EVOLUTION	|vmap|	URL service Veremap
+b23138|EVOLUTION	|vmap|	Mise à jour service geobretagne
+b22980|EVOLUTION	|vmap|	Ajout des miniatures des cartes installées par défaut (cadastre et France)
+b22948|BUG			|vmap|	Envoi de fichiers quand la valeur de l'identifiant est la même que le nom du fichier
+b22912|BUG			|vmap|	Erreur sql dans la vue "s_vmap.v_user_printstyle" si plusieurs styles d'impression sont associés au même utilisateur.
+b22911|BUG			|vmap|	Association des modèles d'impression à un groupe.
+b22783|EVOLUTION	|vmap|	Ajout de la colonne "Objet métier" dans la liste des calques.
+b22685|EVOLUTION	|vmap|	Élimination des notices PHP
+b22647|EVOLUTION	|vmap|	Tous les constructeurs des classes PHP ont été renommé en __construct
+b22618|EVOLUTION	|vmap|	Amélioration de la gestion erreurs
+b22604|BUG			|vmap|	Cas où le token soit outpassed
+b22594|EVOLUTION	|vmap|	Révisions droits
+b22580|EVOLUTION	|vmap|	Revisions Swagger
+b22559|BUG			|vmap|	Noms des systèmees de coordonnées (FIXES #1897)
+b22490|EVOLUTION	|vmap|	Corrections des libellés des modes
+b22433|EVOLUTION	|vmap|	Utilisation des objets métiers sur une base de données aurte
+b22428|EVOLUTION	|vmap|	Import d'objets métier
+b22349|EVOLUTION	|vmap|	Affichage des properties définies dans les fichiers properties_selected.inc
+b22292|				|vmap|	Création 2017.02
+b22195|EVOLUTION	|vmap|	Ajout du service webSocket
+b21827|EVOLUTION	|vmap|	Propriétés "use_veremap_api" et "use_vm4ms_api" pour générer ou non le flux WMS privé de Veremap et vMap4MapServer.
+b21822|EVOLUTION	|vmap|	Taille des formulaires des objets métiers configurable
+b21819|EVOLUTION	|vmap|	Id du flux WMS privé dans les properties.
+b21770|EVOLUTION	|vmap|	Traduction des titres des sections cartes, services, couches
+b21751|EVOLUTION	|vmap|	Génération du flux WMS privée de vMap4MapServer à la connexion de vMap.
+b21576|EVOLUTION	|vmap|	Possibilité de changer les labels lors de la création d'un formulaire objet métier
+b21472|EVOLUTION	|vmap|	La notion de "couche" est remplacée par celle de "calque" dans l'administration.
+b21469|EVOLUTION	|vmap|	Filtre de recherche dans la liste des couches d'une carte.
+b21264|EVOLUTION	|vmap|	Utilisation de flux WMTS
+b21213|BUG			|vmap|	Upload fichiers de même nom
+b21161|EVOLUTION	|vmap|	Création auto du répertoire public/vmap/prints
+b21152|EVOLUTION	|vmap|	Utilisation du composant DocumentViewer (Vitis) pour l'apperçu des images dans les listes
+b22292|				|vmap|	Création 2017.01
+b21125|				|vmap|	Edition des dépendances sortie vmap 2016.03
+b21089|				|vmap|	Images par défaut pour les services et les cartes
+b21078|				|vmap|	Généralisation du dossier conteneur de fichiers à objets métier ou vitis
+b21074|				|vmap|	Bugs jointures
+b21011|				|vmap|	Supprimer les dossiers de l'objet métier lors de la suppression de celui-ci
+b20991|				|vmap|	Upload de fichiers grace aux objets métier
+b20959|				|vmap|	Upload de fichiers
+b20876|				|vmap|	index on business objects
+b20824|				|vmap|	modification modèle par défaut
+b20777|				|vmap|	{{map_scale}} + logs printMap
+b20776|				|vmap|	Intégration couches cadastre
+b20774|				|vmap|	pb cartes sans couches associées
+b20773|				|vmap|	Nettoyage des logs (writeToErrorLog).
+b20769|				|vmap|	my_vitis_id
+b20702|				|vmap|	use_proxy_tiles
+b20683|				|vmap|	session_write_close
+b20585|				|vmap|	Merge branche printreport
+b20584|				|vmap|	Merge branche printreport
+b20542|				|vmap|	Nettoyage des logs (php notice / warning).
+b20405|				|vmap|	échelle pour fiche urb
+b20372|				|vmap|	Template d'impression par défaut
+b20362|				|vmap|	Modifiable -> Éditable
+b20360|				|vmap|	ordre 2
+b20357|				|vmap|	Ordre des couches dans le jeux de données
+b20348|				|vmap|	error_log
+b20347|				|vmap|	- bug: le champ d'identification de l'objet métier ne peut pas être l'oid
+b20269|				|vmap|	Impressions PhantomJS
+b20268|				|vmap|	Impressions PhantomJS
+b20114|				|vmap|	Modification des versions.inc pour ajouter la status à UNSTABLE
+b19919|				|vmap|	v_layer
+b19897|				|vmap|	changement du numéro de version 2016-01.00 en 2016.01.00
+b19894|				|vmap|	erreur armand
+b19893|				|vmap|	Modifications Olivier: ordre des modes
+b19881|				|vmap|	changements olivier dans l'ordre: Services -> Couches -> Cartes
+b19873|				|vmap|	changements olivier
+b19866|				|vmap|	création des repertoires ws_data/vmap et ws_data/business_object si ils n'existent pas
+b19848|				|vmap|	Suppression de l'aasociation de l'utilisateur 1 à un groupe
+b19842|				|vmap|	plus de rotate
+b19841|				|vmap|	properties print
+b19829|				|vmap|	Nettoyage des logs.
+b19827|				|vmap|	Nettoyage des logs.
+b19801|				|vmap|	Admin vMap > Impressions > Modèles / Styles : affichage des valeurs sélectionnées du double select dans le mode "display".
+b19798|				|vmap|	Utilisateurs > groupes (vmap) / privilèges : affichage des valeurs sélectionnées du double select dans le mode "display".
+b19795|				|vmap|	Utilisateurs > utilisateurs / groupes : affichage des valeurs sélectionnées du double select dans le mode "display".
+b19791|				|vmap|	Correction d'erreur sur les sql de signalétique et pdesi
+b19787|				|vmap|	Admin vMap > styles d'impression : Associer des utilisateurs à un style.
+b19783|				|vmap|	Vmap -> vMap
+b19780|				|vmap|	Admin vMap > modèles : suppression des colonnes "Objet métier" et "Ressource" dans la liste.
+b19778|				|vmap|	Admin vMap > cartes et services : correction sur le répertoire et le nom des images et vignettes.
+b19697|				|vmap|	Impressions > modèles : association de groupes d'utilisateurs à un modèle.
+b19680|				|vmap|	is_filtered
+b19674|				|vmap|	Possibilité de modifier les formulaires de filtre des couches via le studio
+b19663|				|vmap|	Paramétrage studio
+b19643|				|vmap|	image OSM
+b19639|				|vmap|	changement de place pour les dossiers du ws_data vmap
+b19635|				|vmap|	valeur imagette osm
+b19630|				|vmap|	Ajout des différents services OSM
+b19627|				|vmap|	Correction pb imagette carte
+b19626|				|vmap|	Correction problème template par défaut impression
+b19599|				|vmap|	Ajout de la config par défaut
+b19589|				|vmap|	Ajout de l'image de la carte OSM fournie par défaut
+b19550|				|vmap|	layer filter
+b19447|				|vmap|	business object sql_form
+b19446|				|vmap|	business object sql_form
+b19415|				|vmap|	ajout du module cadastre dans la table module
+b19385|				|vmap|	Enlève la possibilié à querys d'interroger une table
+b19368|				|vmap|	Correction sur la vue s_vmap.v_layer : suppression de last_update_date et last_update_author
+b19365|				|vmap|	layer: is_dynamic
+b19362|				|vmap|	id_dynamic dans s_vmap.layer
+b19356|				|vmap|	Développement > Evènements : Description des évènements dans un tooltip.
+b19351|				|vmap|	Développement > Evènements : formulaire json.
+b19350|				|vmap|	- Web service "BusinessObjectEvents" (vmap)
+b19349|				|vmap|	Correction sur la vue s_vmap.v_layer : la colonne "s_vmap.business_object.version" n'existe plus.
+b19339|				|vmap|	vitis/businessobject -> vmap/businessobject
+b19338|				|vmap|	vitis/businessobject -> vmap/businessobject
+b19325|				|vmap|	Rajout des paramètres de connexion au websocket dans les properties de vMap
+b19316|				|vmap|	Section "Configuration vMap" du mode "Configuration".
+b19298|				|vmap|	Ajout des tables event et layer_event pour la gestion des messages reçus par les websockets
+b19277|				|vmap|	Location en fonction des objets métier affichés
+b19269|				|vmap|	Location: ne plus se servir des properties, ajouter searshField et resultFiield dans la table business_object
+b19265|				|vmap|	ajout de search_use_strict
+b19259|				|vmap|	ajout des colonnes bo_search_field et bo_result_field
+b19245|				|vmap|	equality_timeout = 5000
+b19244|				|vmap|	impression avec API
+b19243|				|vmap|	impression et outils avec API
+b19242|				|vmap|	impression
+b19240|				|vmap|	timeouts impression
+b19033|				|vmap|	Fichiers apache.conf vide
+b18889|				|vmap|	limit buffer
+b18623|				|vmap|	Intégration des valeurs par défaut pour Vmap
+b18593|				|vmap|	Admin vMap : suppression d'un service -> message d'erreur si le service est lié à une couche.
+b18569|				|vmap|	Admin vMap > "Modules" > "Modules vMap" : pas d'édition des modules.
+b18565|				|vmap|	Web service "vmap/usermodules".
+b18559|				|vmap|	Web service "vmap/userprinttemplates"
+b18544|				|vmap|	Web service "vmap/printtemplates/json" : modèles d'impression et leurs paramètres.
+b18533|				|vmap|	Admin vMap : mise à jour de l'opacité de la couche d'une carte.
+b18518|				|vmap|	- Colonnes manquantes dans la liste des onglets du mode "Impressions".
+b18517|				|vmap|	- Colonnes manquantes dans la liste de l'onglet "Paramètres" (impression).
+b18508|				|vmap|	- Web service "vmap/printparameters".
+b18488|				|vmap|	- Web service "vmap/mapusers"
+b18486|				|vmap|	Admin vMap : section "vmap" dans l'onglet "Utilisateurs" > "Utilisateurs".
+b18480|				|vmap|	- Web service "vmap/printstyles".
+b18479|				|vmap|	Utilisateurs > groupes > vmap : association de modèles d'impression à un groupe.
+b18446|				|vmap|	Web Service "vmap/printtemplates" : tous les champs.
+b18443|				|vmap|	Web services "vmap/format", "vmap/orientation", "vmap/outputformat".
+b18441|				|vmap|	- Colonnes et boutons pour la liste des modèles.
+b18439|				|vmap|	Admin vMap > Modules : privilège du module.
+b18438|				|vmap|	Admin vMap : mode "Impressions" et onglet "Modèles".
+b18424|				|vmap|	Admin vMap > modules.
+b18423|				|vmap|	Web service "vmap/modules".
+b18420|				|vmap|	Admin vMap > mode "Modules".
+b18394|				|vmap|	Modifs des vues "s_vitis.v_section" et "s_vmap.v_map_layer".
+b18393|				|vmap|	Colonne "module" dans la table s_vitis.vm_section.
+b18385|				|vmap|	Admin vMap > Couches de la carte : colonne "opacité".
+b18364|				|vmap|	vmap en premiere position
+b18256|				|vmap|	- Admin vMap : onglet "Thèmes des cartes".
+b18241|				|vmap|	Utilisation du format EWKT
+b18231|				|vmap|	Suppression de la possibilité d'interroger le bo correspondant (le bo_id est fourni dans les attributs de la couche)
+b18220|				|vmap|	- Paramètre "displayName" dans le plugin "ui-grid".
+b18192|				|vmap|	Admin vMAp : suppression de la vignette des cartes et services.
+b18182|				|vmap|	Admin vMap : nom unique pour la vignette des cartes et services.
+b18180|				|vmap|	Admin vmap : onglet "Couches" en 1er.
+b17830|				|vmap|	Correction sur les templates des colonnes de listes (ui-grid).
+b17810|				|vmap|	MapCatalog pour les utilisateurs non vitis_admin
+b17606|				|vmap|	s_vitis.vm_tab : nouvelle colonne "name".
+b17593|				|vmap|	Web service "vmap/maplayers/sorting" : tri des couches d'une couche.
+b17587|				|vmap|	Web service "vmap/maplayers/sorting" : tri des couches d'une couche.
+b17560|				|vmap|	vm_section.ressource_id : paramètres manquants (admin vmap).
+b17556|				|vmap|	Web service "vmap/maplayers" : suppression de couches associées à une carte.
+b17549|				|vmap|	Web service "vmap/maplayers" : association des couches à une carte.
+b17521|				|vmap|	Web service "vmap/maplayers/visibility"
+b17501|				|vmap|	- Section "Couches de la carte" dans l'onglet "Cartes".
+b17493|				|vmap|	Admin Vmap > onglet "Cartes" : association de groupes d'utilisateurs à une carte.
+b17468|				|vmap|	Admin vmap : upload des vignettes dans le répertoire "public".
+b17466|				|vmap|	Web service "vmap/services" -> upload des vignettes.
+b17451|				|vmap|	schéma "s_vitis" (paramètre des properties).
+b17449|				|vmap|	Web service "vmap/servicetypes".
+b17446|				|vmap|	Liste des couches : colonne "Système de coordonnées".
+b17444|				|vmap|	Web service "vmap/layerthemes".
+b17442|				|vmap|	Web service "vmap/vmapgroups" -> upload des vignettes.
+b17441|				|vmap|	Web service "vmap/vmapgroups" -> PUT.
+b17437|				|vmap|	Web service "vmap/vmapgroups"
+b17433|				|vmap|	Section Vmap dans l'onglet Utilisateurs > Groupes.
+b17394|				|vmap|	SQL de vmap dans "Vmap.class.sql.inc".
+b17392|				|vmap|	Web service "vmap/mapthemes".
+b17391|				|vmap|	Sql de vmap admin : create vmap_admin.sql.
+b17389|				|vmap|	Mode "Services" et "Couches" de vmap.
+b17387|				|vmap|	Création du mode "Cartes" de vmap.
+b17062|				|vmap|	suppression business object
+b17058|				|vmap|	suppression du business object
+b16931|				|vmap|	Correction pour suites tests cadastre V2
+b16847|				|vmap|	Correction erreur MAJ vue v_section
+b16845|				|vmap|	Correction module cadastre --> gestion des privilèges (cadastre_user)
+b16829|				|vmap|	suppression fichier maj.sql
diff --git a/src/module_vmap/web_service/_install/dependency.xml b/src/module_vmap/web_service/_install/dependency.xml
new file mode 100644
index 0000000000000000000000000000000000000000..04b3bdfba4ed03ecd4021216c10dea6c61852c41
--- /dev/null
+++ b/src/module_vmap/web_service/_install/dependency.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- WS vMap -->
+<installer>
+	<schema>
+		<name>s_vmap</name>
+		<version>2018.02.02</version>
+		<dependenciesCollection>
+			<dependency>
+				<nature>schema</nature>
+				<name>s_vitis</name>
+				<version>2018.04.01</version>
+				<object>vas</object>
+			</dependency>
+			<dependency>
+				<name>postgis</name>
+				<version>2.0</version>
+				<nature>extern-pre</nature>
+			</dependency>
+		</dependenciesCollection>
+	</schema>
+	<dependenciesCollection>
+		<dependency>
+			<nature>vas</nature>
+			<version>2018.04.01</version>
+		</dependency>
+		<dependency>
+			<name>phantomjs</name>
+			<nature>extern-post</nature>
+			<location>phantomjs-2.1.1</location>
+		</dependency>
+	</dependenciesCollection>
+</installer>
diff --git a/vmap/vas/rest/conf/vmap/properties.inc b/src/module_vmap/web_service/conf/properties.inc
similarity index 100%
rename from vmap/vas/rest/conf/vmap/properties.inc
rename to src/module_vmap/web_service/conf/properties.inc
diff --git a/vmap/vas/rest/conf/vmap/properties_server.inc b/src/module_vmap/web_service/conf/properties_server.inc
similarity index 100%
rename from vmap/vas/rest/conf/vmap/properties_server.inc
rename to src/module_vmap/web_service/conf/properties_server.inc
diff --git a/vmap/vas/rest/conf/vmap/selected_properties.inc b/src/module_vmap/web_service/conf/selected_properties.inc
similarity index 100%
rename from vmap/vas/rest/conf/vmap/selected_properties.inc
rename to src/module_vmap/web_service/conf/selected_properties.inc
diff --git a/vmap/vas/rest/conf/vmap/version.inc b/src/module_vmap/web_service/conf/version.inc
similarity index 100%
rename from vmap/vas/rest/conf/vmap/version.inc
rename to src/module_vmap/web_service/conf/version.inc
diff --git a/src/module_vmap/web_service/public/images/imagettes/aerial-with-labels.png b/src/module_vmap/web_service/public/images/imagettes/aerial-with-labels.png
new file mode 100755
index 0000000000000000000000000000000000000000..43b8fc657822000799f3135d01f75d2c40579634
Binary files /dev/null and b/src/module_vmap/web_service/public/images/imagettes/aerial-with-labels.png differ
diff --git a/src/module_vmap/web_service/public/images/imagettes/aerial.png b/src/module_vmap/web_service/public/images/imagettes/aerial.png
new file mode 100755
index 0000000000000000000000000000000000000000..884dd82c67b2a9250f6e5e838b3a04421d67cb69
Binary files /dev/null and b/src/module_vmap/web_service/public/images/imagettes/aerial.png differ
diff --git a/src/module_vmap/web_service/public/images/imagettes/cadastre.jpg b/src/module_vmap/web_service/public/images/imagettes/cadastre.jpg
new file mode 100755
index 0000000000000000000000000000000000000000..6987ff7c7c80fa60b375e42d7317fdf1b467fd83
Binary files /dev/null and b/src/module_vmap/web_service/public/images/imagettes/cadastre.jpg differ
diff --git a/src/module_vmap/web_service/public/images/imagettes/landscape-294.png b/src/module_vmap/web_service/public/images/imagettes/landscape-294.png
new file mode 100755
index 0000000000000000000000000000000000000000..061dfe711dce62dd394bebebea1b86c255e01f8c
Binary files /dev/null and b/src/module_vmap/web_service/public/images/imagettes/landscape-294.png differ
diff --git a/src/module_vmap/web_service/public/images/imagettes/opencyclemap.png b/src/module_vmap/web_service/public/images/imagettes/opencyclemap.png
new file mode 100755
index 0000000000000000000000000000000000000000..7c6b126883d984cfac4276e9fdca99e73dc99c43
Binary files /dev/null and b/src/module_vmap/web_service/public/images/imagettes/opencyclemap.png differ
diff --git a/src/module_vmap/web_service/public/images/imagettes/osm.png b/src/module_vmap/web_service/public/images/imagettes/osm.png
new file mode 100755
index 0000000000000000000000000000000000000000..10ffb41190a4f008634eb1043912e078ed1720ec
Binary files /dev/null and b/src/module_vmap/web_service/public/images/imagettes/osm.png differ
diff --git a/src/module_vmap/web_service/public/images/imagettes/outdoors-294.png b/src/module_vmap/web_service/public/images/imagettes/outdoors-294.png
new file mode 100755
index 0000000000000000000000000000000000000000..d006a4ea4bc7a4918bec8321275cc79a286139a6
Binary files /dev/null and b/src/module_vmap/web_service/public/images/imagettes/outdoors-294.png differ
diff --git a/src/module_vmap/web_service/public/images/imagettes/road.png b/src/module_vmap/web_service/public/images/imagettes/road.png
new file mode 100755
index 0000000000000000000000000000000000000000..82b3f1af24e842d09306464eca1c067871fd72db
Binary files /dev/null and b/src/module_vmap/web_service/public/images/imagettes/road.png differ
diff --git a/src/module_vmap/web_service/public/images/imagettes/seamap.png b/src/module_vmap/web_service/public/images/imagettes/seamap.png
new file mode 100755
index 0000000000000000000000000000000000000000..bf90482bebf8cf33326b5649f3f63d34a8abdc60
Binary files /dev/null and b/src/module_vmap/web_service/public/images/imagettes/seamap.png differ
diff --git a/src/module_vmap/web_service/public/images/imagettes/transport-294.png b/src/module_vmap/web_service/public/images/imagettes/transport-294.png
new file mode 100755
index 0000000000000000000000000000000000000000..289d73f438b99d74fc45f42d0d5208ecf5b326f5
Binary files /dev/null and b/src/module_vmap/web_service/public/images/imagettes/transport-294.png differ
diff --git a/src/module_vmap/web_service/public/images/imagettes/transport-dark-294.png b/src/module_vmap/web_service/public/images/imagettes/transport-dark-294.png
new file mode 100755
index 0000000000000000000000000000000000000000..5cf337d0c5775524bcbddbda2c9e5b087b5294e7
Binary files /dev/null and b/src/module_vmap/web_service/public/images/imagettes/transport-dark-294.png differ
diff --git a/vmap/vas/sql/vmap/sqlQueries.xml b/src/module_vmap/web_service/sql/sqlQueries.xml
similarity index 100%
rename from vmap/vas/sql/vmap/sqlQueries.xml
rename to src/module_vmap/web_service/sql/sqlQueries.xml
diff --git a/vmap/vas/rest/ws/vmap/BusinessObject.class.inc b/src/module_vmap/web_service/ws/BusinessObject.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/BusinessObject.class.inc
rename to src/module_vmap/web_service/ws/BusinessObject.class.inc
diff --git a/vmap/vas/rest/ws/vmap/BusinessObjectEvent.class.inc b/src/module_vmap/web_service/ws/BusinessObjectEvent.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/BusinessObjectEvent.class.inc
rename to src/module_vmap/web_service/ws/BusinessObjectEvent.class.inc
diff --git a/vmap/vas/rest/ws/vmap/BusinessObjectEvents.class.inc b/src/module_vmap/web_service/ws/BusinessObjectEvents.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/BusinessObjectEvents.class.inc
rename to src/module_vmap/web_service/ws/BusinessObjectEvents.class.inc
diff --git a/vmap/vas/rest/ws/vmap/BusinessObjects.class.inc b/src/module_vmap/web_service/ws/BusinessObjects.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/BusinessObjects.class.inc
rename to src/module_vmap/web_service/ws/BusinessObjects.class.inc
diff --git a/vmap/vas/rest/ws/vmap/CHANGE_LOG.txt b/src/module_vmap/web_service/ws/CHANGE_LOG.txt
similarity index 100%
rename from vmap/vas/rest/ws/vmap/CHANGE_LOG.txt
rename to src/module_vmap/web_service/ws/CHANGE_LOG.txt
diff --git a/vmap/vas/rest/ws/vmap/CRS.class.inc b/src/module_vmap/web_service/ws/CRS.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/CRS.class.inc
rename to src/module_vmap/web_service/ws/CRS.class.inc
diff --git a/vmap/vas/rest/ws/vmap/CRSs.class.inc b/src/module_vmap/web_service/ws/CRSs.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/CRSs.class.inc
rename to src/module_vmap/web_service/ws/CRSs.class.inc
diff --git a/vmap/vas/rest/ws/vmap/Format.class.inc b/src/module_vmap/web_service/ws/Format.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/Format.class.inc
rename to src/module_vmap/web_service/ws/Format.class.inc
diff --git a/vmap/vas/rest/ws/vmap/Formats.class.inc b/src/module_vmap/web_service/ws/Formats.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/Formats.class.inc
rename to src/module_vmap/web_service/ws/Formats.class.inc
diff --git a/vmap/vas/rest/ws/vmap/Layer.class.inc b/src/module_vmap/web_service/ws/Layer.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/Layer.class.inc
rename to src/module_vmap/web_service/ws/Layer.class.inc
diff --git a/vmap/vas/rest/ws/vmap/LayerTheme.class.inc b/src/module_vmap/web_service/ws/LayerTheme.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/LayerTheme.class.inc
rename to src/module_vmap/web_service/ws/LayerTheme.class.inc
diff --git a/vmap/vas/rest/ws/vmap/LayerThemes.class.inc b/src/module_vmap/web_service/ws/LayerThemes.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/LayerThemes.class.inc
rename to src/module_vmap/web_service/ws/LayerThemes.class.inc
diff --git a/vmap/vas/rest/ws/vmap/Layers.class.inc b/src/module_vmap/web_service/ws/Layers.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/Layers.class.inc
rename to src/module_vmap/web_service/ws/Layers.class.inc
diff --git a/vmap/vas/rest/ws/vmap/Map.class.inc b/src/module_vmap/web_service/ws/Map.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/Map.class.inc
rename to src/module_vmap/web_service/ws/Map.class.inc
diff --git a/vmap/vas/rest/ws/vmap/MapCatalog.class.inc b/src/module_vmap/web_service/ws/MapCatalog.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/MapCatalog.class.inc
rename to src/module_vmap/web_service/ws/MapCatalog.class.inc
diff --git a/vmap/vas/rest/ws/vmap/MapCatalogs.class.inc b/src/module_vmap/web_service/ws/MapCatalogs.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/MapCatalogs.class.inc
rename to src/module_vmap/web_service/ws/MapCatalogs.class.inc
diff --git a/vmap/vas/rest/ws/vmap/MapJSON.class.inc b/src/module_vmap/web_service/ws/MapJSON.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/MapJSON.class.inc
rename to src/module_vmap/web_service/ws/MapJSON.class.inc
diff --git a/vmap/vas/rest/ws/vmap/MapJSONs.class.inc b/src/module_vmap/web_service/ws/MapJSONs.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/MapJSONs.class.inc
rename to src/module_vmap/web_service/ws/MapJSONs.class.inc
diff --git a/vmap/vas/rest/ws/vmap/MapLayer.class.inc b/src/module_vmap/web_service/ws/MapLayer.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/MapLayer.class.inc
rename to src/module_vmap/web_service/ws/MapLayer.class.inc
diff --git a/vmap/vas/rest/ws/vmap/MapLayers.class.inc b/src/module_vmap/web_service/ws/MapLayers.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/MapLayers.class.inc
rename to src/module_vmap/web_service/ws/MapLayers.class.inc
diff --git a/vmap/vas/rest/ws/vmap/MapTheme.class.inc b/src/module_vmap/web_service/ws/MapTheme.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/MapTheme.class.inc
rename to src/module_vmap/web_service/ws/MapTheme.class.inc
diff --git a/vmap/vas/rest/ws/vmap/MapThemes.class.inc b/src/module_vmap/web_service/ws/MapThemes.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/MapThemes.class.inc
rename to src/module_vmap/web_service/ws/MapThemes.class.inc
diff --git a/vmap/vas/rest/ws/vmap/Maps.class.inc b/src/module_vmap/web_service/ws/Maps.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/Maps.class.inc
rename to src/module_vmap/web_service/ws/Maps.class.inc
diff --git a/vmap/vas/rest/ws/vmap/Module.class.inc b/src/module_vmap/web_service/ws/Module.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/Module.class.inc
rename to src/module_vmap/web_service/ws/Module.class.inc
diff --git a/vmap/vas/rest/ws/vmap/Modules.class.inc b/src/module_vmap/web_service/ws/Modules.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/Modules.class.inc
rename to src/module_vmap/web_service/ws/Modules.class.inc
diff --git a/vmap/vas/rest/ws/vmap/Orientation.class.inc b/src/module_vmap/web_service/ws/Orientation.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/Orientation.class.inc
rename to src/module_vmap/web_service/ws/Orientation.class.inc
diff --git a/vmap/vas/rest/ws/vmap/Orientations.class.inc b/src/module_vmap/web_service/ws/Orientations.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/Orientations.class.inc
rename to src/module_vmap/web_service/ws/Orientations.class.inc
diff --git a/vmap/vas/rest/ws/vmap/OutputFormat.class.inc b/src/module_vmap/web_service/ws/OutputFormat.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/OutputFormat.class.inc
rename to src/module_vmap/web_service/ws/OutputFormat.class.inc
diff --git a/vmap/vas/rest/ws/vmap/OutputFormats.class.inc b/src/module_vmap/web_service/ws/OutputFormats.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/OutputFormats.class.inc
rename to src/module_vmap/web_service/ws/OutputFormats.class.inc
diff --git a/vmap/vas/rest/ws/vmap/PrintMapServices.class.inc b/src/module_vmap/web_service/ws/PrintMapServices.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/PrintMapServices.class.inc
rename to src/module_vmap/web_service/ws/PrintMapServices.class.inc
diff --git a/vmap/vas/rest/ws/vmap/PrintParameter.class.inc b/src/module_vmap/web_service/ws/PrintParameter.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/PrintParameter.class.inc
rename to src/module_vmap/web_service/ws/PrintParameter.class.inc
diff --git a/vmap/vas/rest/ws/vmap/PrintParameters.class.inc b/src/module_vmap/web_service/ws/PrintParameters.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/PrintParameters.class.inc
rename to src/module_vmap/web_service/ws/PrintParameters.class.inc
diff --git a/vmap/vas/rest/ws/vmap/PrintReport.class.inc b/src/module_vmap/web_service/ws/PrintReport.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/PrintReport.class.inc
rename to src/module_vmap/web_service/ws/PrintReport.class.inc
diff --git a/vmap/vas/rest/ws/vmap/PrintReportServices.class.inc b/src/module_vmap/web_service/ws/PrintReportServices.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/PrintReportServices.class.inc
rename to src/module_vmap/web_service/ws/PrintReportServices.class.inc
diff --git a/vmap/vas/rest/ws/vmap/PrintReports.class.inc b/src/module_vmap/web_service/ws/PrintReports.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/PrintReports.class.inc
rename to src/module_vmap/web_service/ws/PrintReports.class.inc
diff --git a/vmap/vas/rest/ws/vmap/PrintServices.class.inc b/src/module_vmap/web_service/ws/PrintServices.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/PrintServices.class.inc
rename to src/module_vmap/web_service/ws/PrintServices.class.inc
diff --git a/vmap/vas/rest/ws/vmap/PrintStyle.class.inc b/src/module_vmap/web_service/ws/PrintStyle.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/PrintStyle.class.inc
rename to src/module_vmap/web_service/ws/PrintStyle.class.inc
diff --git a/vmap/vas/rest/ws/vmap/PrintStyles.class.inc b/src/module_vmap/web_service/ws/PrintStyles.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/PrintStyles.class.inc
rename to src/module_vmap/web_service/ws/PrintStyles.class.inc
diff --git a/vmap/vas/rest/ws/vmap/PrintTemplate.class.inc b/src/module_vmap/web_service/ws/PrintTemplate.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/PrintTemplate.class.inc
rename to src/module_vmap/web_service/ws/PrintTemplate.class.inc
diff --git a/vmap/vas/rest/ws/vmap/PrintTemplateServices.class.inc b/src/module_vmap/web_service/ws/PrintTemplateServices.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/PrintTemplateServices.class.inc
rename to src/module_vmap/web_service/ws/PrintTemplateServices.class.inc
diff --git a/vmap/vas/rest/ws/vmap/PrintTemplates.class.inc b/src/module_vmap/web_service/ws/PrintTemplates.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/PrintTemplates.class.inc
rename to src/module_vmap/web_service/ws/PrintTemplates.class.inc
diff --git a/vmap/vas/rest/ws/vmap/Query.class.inc b/src/module_vmap/web_service/ws/Query.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/Query.class.inc
rename to src/module_vmap/web_service/ws/Query.class.inc
diff --git a/vmap/vas/rest/ws/vmap/Querys.class.inc b/src/module_vmap/web_service/ws/Querys.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/Querys.class.inc
rename to src/module_vmap/web_service/ws/Querys.class.inc
diff --git a/vmap/vas/rest/ws/vmap/Service.class.inc b/src/module_vmap/web_service/ws/Service.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/Service.class.inc
rename to src/module_vmap/web_service/ws/Service.class.inc
diff --git a/vmap/vas/rest/ws/vmap/ServiceType.class.inc b/src/module_vmap/web_service/ws/ServiceType.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/ServiceType.class.inc
rename to src/module_vmap/web_service/ws/ServiceType.class.inc
diff --git a/vmap/vas/rest/ws/vmap/ServiceTypes.class.inc b/src/module_vmap/web_service/ws/ServiceTypes.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/ServiceTypes.class.inc
rename to src/module_vmap/web_service/ws/ServiceTypes.class.inc
diff --git a/vmap/vas/rest/ws/vmap/Services.class.inc b/src/module_vmap/web_service/ws/Services.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/Services.class.inc
rename to src/module_vmap/web_service/ws/Services.class.inc
diff --git a/vmap/vas/rest/ws/vmap/UserModule.class.inc b/src/module_vmap/web_service/ws/UserModule.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/UserModule.class.inc
rename to src/module_vmap/web_service/ws/UserModule.class.inc
diff --git a/vmap/vas/rest/ws/vmap/UserModules.class.inc b/src/module_vmap/web_service/ws/UserModules.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/UserModules.class.inc
rename to src/module_vmap/web_service/ws/UserModules.class.inc
diff --git a/vmap/vas/rest/ws/vmap/UserPrintStyle.class.inc b/src/module_vmap/web_service/ws/UserPrintStyle.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/UserPrintStyle.class.inc
rename to src/module_vmap/web_service/ws/UserPrintStyle.class.inc
diff --git a/vmap/vas/rest/ws/vmap/UserPrintStyles.class.inc b/src/module_vmap/web_service/ws/UserPrintStyles.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/UserPrintStyles.class.inc
rename to src/module_vmap/web_service/ws/UserPrintStyles.class.inc
diff --git a/vmap/vas/rest/ws/vmap/UserPrintTemplate.class.inc b/src/module_vmap/web_service/ws/UserPrintTemplate.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/UserPrintTemplate.class.inc
rename to src/module_vmap/web_service/ws/UserPrintTemplate.class.inc
diff --git a/vmap/vas/rest/ws/vmap/UserPrintTemplates.class.inc b/src/module_vmap/web_service/ws/UserPrintTemplates.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/UserPrintTemplates.class.inc
rename to src/module_vmap/web_service/ws/UserPrintTemplates.class.inc
diff --git a/vmap/vas/rest/ws/vmap/Versions.class.inc b/src/module_vmap/web_service/ws/Versions.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/Versions.class.inc
rename to src/module_vmap/web_service/ws/Versions.class.inc
diff --git a/vmap/vas/rest/ws/vmap/Vex.class.inc b/src/module_vmap/web_service/ws/Vex.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/Vex.class.inc
rename to src/module_vmap/web_service/ws/Vex.class.inc
diff --git a/vmap/vas/rest/ws/vmap/Vex.class.sql.inc b/src/module_vmap/web_service/ws/Vex.class.sql.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/Vex.class.sql.inc
rename to src/module_vmap/web_service/ws/Vex.class.sql.inc
diff --git a/vmap/vas/rest/ws/vmap/VexExport.class.inc b/src/module_vmap/web_service/ws/VexExport.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/VexExport.class.inc
rename to src/module_vmap/web_service/ws/VexExport.class.inc
diff --git a/vmap/vas/rest/ws/vmap/VexGetter.class.inc b/src/module_vmap/web_service/ws/VexGetter.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/VexGetter.class.inc
rename to src/module_vmap/web_service/ws/VexGetter.class.inc
diff --git a/vmap/vas/rest/ws/vmap/VexImport.class.inc b/src/module_vmap/web_service/ws/VexImport.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/VexImport.class.inc
rename to src/module_vmap/web_service/ws/VexImport.class.inc
diff --git a/vmap/vas/rest/ws/vmap/VexParser.class.inc b/src/module_vmap/web_service/ws/VexParser.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/VexParser.class.inc
rename to src/module_vmap/web_service/ws/VexParser.class.inc
diff --git a/vmap/vas/rest/ws/vmap/Vmap.class.inc b/src/module_vmap/web_service/ws/Vmap.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/Vmap.class.inc
rename to src/module_vmap/web_service/ws/Vmap.class.inc
diff --git a/vmap/vas/rest/ws/vmap/Vmap.class.sql.inc b/src/module_vmap/web_service/ws/Vmap.class.sql.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/Vmap.class.sql.inc
rename to src/module_vmap/web_service/ws/Vmap.class.sql.inc
diff --git a/vmap/vas/rest/ws/vmap/VmapGroup.class.inc b/src/module_vmap/web_service/ws/VmapGroup.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/VmapGroup.class.inc
rename to src/module_vmap/web_service/ws/VmapGroup.class.inc
diff --git a/vmap/vas/rest/ws/vmap/VmapGroups.class.inc b/src/module_vmap/web_service/ws/VmapGroups.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/VmapGroups.class.inc
rename to src/module_vmap/web_service/ws/VmapGroups.class.inc
diff --git a/vmap/vas/rest/ws/vmap/VmapUser.class.inc b/src/module_vmap/web_service/ws/VmapUser.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/VmapUser.class.inc
rename to src/module_vmap/web_service/ws/VmapUser.class.inc
diff --git a/vmap/vas/rest/ws/vmap/VmapUsers.class.inc b/src/module_vmap/web_service/ws/VmapUsers.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vmap/VmapUsers.class.inc
rename to src/module_vmap/web_service/ws/VmapUsers.class.inc
diff --git a/vmap/vas/rest/ws/vmap/overview.phtml b/src/module_vmap/web_service/ws/overview.phtml
similarity index 100%
rename from vmap/vas/rest/ws/vmap/overview.phtml
rename to src/module_vmap/web_service/ws/overview.phtml
diff --git a/src/module_vmap/web_service/ws_data/vitis/vmap_admin_map_vmap_admin_map/documents/-2/thumbnail/france.jpg b/src/module_vmap/web_service/ws_data/vitis/vmap_admin_map_vmap_admin_map/documents/-2/thumbnail/france.jpg
new file mode 100755
index 0000000000000000000000000000000000000000..bd6b8814b47bf6be2fe6cbedf7e5bcf1fb92197a
Binary files /dev/null and b/src/module_vmap/web_service/ws_data/vitis/vmap_admin_map_vmap_admin_map/documents/-2/thumbnail/france.jpg differ
diff --git a/src/module_vmap/web_service/ws_data/vitis/vmap_admin_map_vmap_admin_map/documents/-3/thumbnail/cadastre.jpg b/src/module_vmap/web_service/ws_data/vitis/vmap_admin_map_vmap_admin_map/documents/-3/thumbnail/cadastre.jpg
new file mode 100755
index 0000000000000000000000000000000000000000..b1038352078e6b87d3207e87c328e0c62bf907f0
Binary files /dev/null and b/src/module_vmap/web_service/ws_data/vitis/vmap_admin_map_vmap_admin_map/documents/-3/thumbnail/cadastre.jpg differ
diff --git a/src/module_vmap/web_service/ws_data/vitis/vmap_admin_map_vmap_admin_map/documents/15/thumbnail/geobret.png b/src/module_vmap/web_service/ws_data/vitis/vmap_admin_map_vmap_admin_map/documents/15/thumbnail/geobret.png
new file mode 100755
index 0000000000000000000000000000000000000000..e7be8aff817c45a14c8347b517d768354f952625
Binary files /dev/null and b/src/module_vmap/web_service/ws_data/vitis/vmap_admin_map_vmap_admin_map/documents/15/thumbnail/geobret.png differ
diff --git a/src/module_vmap/web_service/ws_data/vitis/vmap_admin_map_vmap_services/documents/10/thumbnail/transport-dark-294.png b/src/module_vmap/web_service/ws_data/vitis/vmap_admin_map_vmap_services/documents/10/thumbnail/transport-dark-294.png
new file mode 100755
index 0000000000000000000000000000000000000000..5cf337d0c5775524bcbddbda2c9e5b087b5294e7
Binary files /dev/null and b/src/module_vmap/web_service/ws_data/vitis/vmap_admin_map_vmap_services/documents/10/thumbnail/transport-dark-294.png differ
diff --git a/src/module_vmap/web_service/ws_data/vitis/vmap_admin_map_vmap_services/documents/4/thumbnail/osm.png b/src/module_vmap/web_service/ws_data/vitis/vmap_admin_map_vmap_services/documents/4/thumbnail/osm.png
new file mode 100755
index 0000000000000000000000000000000000000000..10ffb41190a4f008634eb1043912e078ed1720ec
Binary files /dev/null and b/src/module_vmap/web_service/ws_data/vitis/vmap_admin_map_vmap_services/documents/4/thumbnail/osm.png differ
diff --git a/src/module_vmap/web_service/ws_data/vitis/vmap_admin_map_vmap_services/documents/5/thumbnail/seamap.png b/src/module_vmap/web_service/ws_data/vitis/vmap_admin_map_vmap_services/documents/5/thumbnail/seamap.png
new file mode 100755
index 0000000000000000000000000000000000000000..bf90482bebf8cf33326b5649f3f63d34a8abdc60
Binary files /dev/null and b/src/module_vmap/web_service/ws_data/vitis/vmap_admin_map_vmap_services/documents/5/thumbnail/seamap.png differ
diff --git a/src/module_vmap/web_service/ws_data/vitis/vmap_admin_map_vmap_services/documents/6/thumbnail/opencyclemap.png b/src/module_vmap/web_service/ws_data/vitis/vmap_admin_map_vmap_services/documents/6/thumbnail/opencyclemap.png
new file mode 100755
index 0000000000000000000000000000000000000000..7c6b126883d984cfac4276e9fdca99e73dc99c43
Binary files /dev/null and b/src/module_vmap/web_service/ws_data/vitis/vmap_admin_map_vmap_services/documents/6/thumbnail/opencyclemap.png differ
diff --git a/src/module_vmap/web_service/ws_data/vitis/vmap_admin_map_vmap_services/documents/7/thumbnail/transport-294.png b/src/module_vmap/web_service/ws_data/vitis/vmap_admin_map_vmap_services/documents/7/thumbnail/transport-294.png
new file mode 100755
index 0000000000000000000000000000000000000000..289d73f438b99d74fc45f42d0d5208ecf5b326f5
Binary files /dev/null and b/src/module_vmap/web_service/ws_data/vitis/vmap_admin_map_vmap_services/documents/7/thumbnail/transport-294.png differ
diff --git a/src/module_vmap/web_service/ws_data/vitis/vmap_admin_map_vmap_services/documents/8/thumbnail/landscape-294.png b/src/module_vmap/web_service/ws_data/vitis/vmap_admin_map_vmap_services/documents/8/thumbnail/landscape-294.png
new file mode 100755
index 0000000000000000000000000000000000000000..061dfe711dce62dd394bebebea1b86c255e01f8c
Binary files /dev/null and b/src/module_vmap/web_service/ws_data/vitis/vmap_admin_map_vmap_services/documents/8/thumbnail/landscape-294.png differ
diff --git a/src/module_vmap/web_service/ws_data/vitis/vmap_admin_map_vmap_services/documents/9/thumbnail/outdoors-294.png b/src/module_vmap/web_service/ws_data/vitis/vmap_admin_map_vmap_services/documents/9/thumbnail/outdoors-294.png
new file mode 100755
index 0000000000000000000000000000000000000000..d006a4ea4bc7a4918bec8321275cc79a286139a6
Binary files /dev/null and b/src/module_vmap/web_service/ws_data/vitis/vmap_admin_map_vmap_services/documents/9/thumbnail/outdoors-294.png differ
diff --git a/vmap/vas/doc/vendor/symfony/finder/Tests/Fixtures/A/B/C/abc.dat b/src/vitis/.gitignore
old mode 100755
new mode 100644
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Tests/Fixtures/A/B/C/abc.dat
rename to src/vitis/.gitignore
diff --git a/vmap/README.md b/src/vitis/README.md
similarity index 100%
rename from vmap/README.md
rename to src/vitis/README.md
diff --git a/src/vitis/client/.htaccess b/src/vitis/client/.htaccess
new file mode 100755
index 0000000000000000000000000000000000000000..60f82fa0c5eec904676aef82858e29db2ca57003
--- /dev/null
+++ b/src/vitis/client/.htaccess
@@ -0,0 +1,22 @@
+<IfModule mod_deflate.c>
+  # place filter 'DEFLATE' on all outgoing content
+  SetOutputFilter DEFLATE
+  # exclude uncompressible content via file type
+  SetEnvIfNoCase Request_URI \.(?:gif|jpe?g|png|rar|zip)$ no-gzip
+  <IfModule mod_headers.c>
+    # properly handle requests coming from behind proxies
+    Header append Vary User-Agent
+  </IfModule>
+</IfModule>
+RewriteEngine On
+#RewriteCond %{REQUEST_FILENAME} !-f
+#RewriteCond %{REQUEST_FILENAME} !-d
+#Enlève le répertoire de l'application ???
+#RewriteRule (.*) %1 [L]
+#Mode debug ?
+#RewriteCond %{QUERY_STRING} debug
+#RewriteRule ^$ index-debug.html [L]
+#Eviter le cross-domain.
+Header set Access-Control-Allow-Origin "*"
+Header set Access-Control-Allow-Headers "origin, x-requested-with, content-type"
+Header set Access-Control-Allow-Methods "PUT, GET, POST, DELETE, OPTIONS"
diff --git a/vmap/client/CHANGE_LOG.txt b/src/vitis/client/CHANGE_LOG.txt
similarity index 100%
rename from vmap/client/CHANGE_LOG.txt
rename to src/vitis/client/CHANGE_LOG.txt
diff --git a/vmap/client/_install/dependency.xml b/src/vitis/client/_install/dependency.xml
old mode 100644
new mode 100755
similarity index 81%
rename from vmap/client/_install/dependency.xml
rename to src/vitis/client/_install/dependency.xml
index 05bb85fbdcf8755b4669235e38446742273f89aa..d550d0ab3dd930e418a485f8466e1ae16e52f874
--- a/vmap/client/_install/dependency.xml
+++ b/src/vitis/client/_install/dependency.xml
@@ -4,7 +4,7 @@
 	<dependenciesCollection>
 		<dependency>
 			<nature>vas</nature>
-			<version>2018.04.01</version>
+			<version>2018.05.00</version>
 		</dependency>
 	</dependenciesCollection>
 </installer>
diff --git a/vmap/client/_install/fileToDelete.txt b/src/vitis/client/_install/fileToDelete.txt
similarity index 100%
rename from vmap/client/_install/fileToDelete.txt
rename to src/vitis/client/_install/fileToDelete.txt
diff --git a/vmap/client/_install/folderToDelete.txt b/src/vitis/client/_install/folderToDelete.txt
similarity index 100%
rename from vmap/client/_install/folderToDelete.txt
rename to src/vitis/client/_install/folderToDelete.txt
diff --git a/vmap/client/_install/listModuleApache.txt b/src/vitis/client/_install/listModuleApache.txt
similarity index 100%
rename from vmap/client/_install/listModuleApache.txt
rename to src/vitis/client/_install/listModuleApache.txt
diff --git a/vmap/client/css/icons/fonts/veremes.eot b/src/vitis/client/css/icons/fonts/veremes.eot
old mode 100644
new mode 100755
similarity index 100%
rename from vmap/client/css/icons/fonts/veremes.eot
rename to src/vitis/client/css/icons/fonts/veremes.eot
diff --git a/vmap/client/css/icons/fonts/veremes.svg b/src/vitis/client/css/icons/fonts/veremes.svg
old mode 100644
new mode 100755
similarity index 100%
rename from vmap/client/css/icons/fonts/veremes.svg
rename to src/vitis/client/css/icons/fonts/veremes.svg
diff --git a/vmap/client/css/icons/fonts/veremes.ttf b/src/vitis/client/css/icons/fonts/veremes.ttf
old mode 100644
new mode 100755
similarity index 100%
rename from vmap/client/css/icons/fonts/veremes.ttf
rename to src/vitis/client/css/icons/fonts/veremes.ttf
diff --git a/vmap/client/css/icons/fonts/veremes.woff b/src/vitis/client/css/icons/fonts/veremes.woff
old mode 100644
new mode 100755
similarity index 100%
rename from vmap/client/css/icons/fonts/veremes.woff
rename to src/vitis/client/css/icons/fonts/veremes.woff
diff --git a/vmap/client/css/icons/selection.json b/src/vitis/client/css/icons/selection.json
old mode 100644
new mode 100755
similarity index 100%
rename from vmap/client/css/icons/selection.json
rename to src/vitis/client/css/icons/selection.json
diff --git a/vmap/client/css/icons/style.css b/src/vitis/client/css/icons/style.css
old mode 100644
new mode 100755
similarity index 100%
rename from vmap/client/css/icons/style.css
rename to src/vitis/client/css/icons/style.css
diff --git a/vmap/client/css/lib/awesome-bootstrap-checkbox.css b/src/vitis/client/css/lib/awesome-bootstrap-checkbox.css
similarity index 100%
rename from vmap/client/css/lib/awesome-bootstrap-checkbox.css
rename to src/vitis/client/css/lib/awesome-bootstrap-checkbox.css
diff --git a/vmap/client/modules/vmap/css/lib/bootstrap-checkbox/build.css b/src/vitis/client/css/lib/bootstrap-checkbox/build.css
similarity index 100%
rename from vmap/client/modules/vmap/css/lib/bootstrap-checkbox/build.css
rename to src/vitis/client/css/lib/bootstrap-checkbox/build.css
diff --git a/vmap/client/css/lib/bootstrap-checkbox/font-awesome.css b/src/vitis/client/css/lib/bootstrap-checkbox/font-awesome.css
similarity index 100%
rename from vmap/client/css/lib/bootstrap-checkbox/font-awesome.css
rename to src/vitis/client/css/lib/bootstrap-checkbox/font-awesome.css
diff --git a/vmap/client/css/lib/bootstrap-checkbox/font-awesome.min.css b/src/vitis/client/css/lib/bootstrap-checkbox/font-awesome.min.css
similarity index 100%
rename from vmap/client/css/lib/bootstrap-checkbox/font-awesome.min.css
rename to src/vitis/client/css/lib/bootstrap-checkbox/font-awesome.min.css
diff --git a/vmap/client/modules/vmap/css/lib/bootstrap/css/bootstrap-theme.css b/src/vitis/client/css/lib/bootstrap/css/bootstrap-theme.css
similarity index 100%
rename from vmap/client/modules/vmap/css/lib/bootstrap/css/bootstrap-theme.css
rename to src/vitis/client/css/lib/bootstrap/css/bootstrap-theme.css
diff --git a/vmap/client/modules/vmap/css/lib/bootstrap/css/bootstrap-theme.css.map b/src/vitis/client/css/lib/bootstrap/css/bootstrap-theme.css.map
similarity index 100%
rename from vmap/client/modules/vmap/css/lib/bootstrap/css/bootstrap-theme.css.map
rename to src/vitis/client/css/lib/bootstrap/css/bootstrap-theme.css.map
diff --git a/vmap/client/modules/vmap/css/lib/bootstrap/css/bootstrap-theme.min.css b/src/vitis/client/css/lib/bootstrap/css/bootstrap-theme.min.css
similarity index 100%
rename from vmap/client/modules/vmap/css/lib/bootstrap/css/bootstrap-theme.min.css
rename to src/vitis/client/css/lib/bootstrap/css/bootstrap-theme.min.css
diff --git a/vmap/client/css/lib/bootstrap/css/bootstrap.css b/src/vitis/client/css/lib/bootstrap/css/bootstrap.css
similarity index 100%
rename from vmap/client/css/lib/bootstrap/css/bootstrap.css
rename to src/vitis/client/css/lib/bootstrap/css/bootstrap.css
diff --git a/vmap/client/modules/vmap/css/lib/bootstrap/css/bootstrap.css.map b/src/vitis/client/css/lib/bootstrap/css/bootstrap.css.map
similarity index 100%
rename from vmap/client/modules/vmap/css/lib/bootstrap/css/bootstrap.css.map
rename to src/vitis/client/css/lib/bootstrap/css/bootstrap.css.map
diff --git a/vmap/client/modules/vmap/css/lib/bootstrap/css/bootstrap.min.css b/src/vitis/client/css/lib/bootstrap/css/bootstrap.min.css
similarity index 100%
rename from vmap/client/modules/vmap/css/lib/bootstrap/css/bootstrap.min.css
rename to src/vitis/client/css/lib/bootstrap/css/bootstrap.min.css
diff --git a/vmap/client/modules/vmap/css/lib/bootstrap/fonts/glyphicons-halflings-regular.eot b/src/vitis/client/css/lib/bootstrap/fonts/glyphicons-halflings-regular.eot
similarity index 100%
rename from vmap/client/modules/vmap/css/lib/bootstrap/fonts/glyphicons-halflings-regular.eot
rename to src/vitis/client/css/lib/bootstrap/fonts/glyphicons-halflings-regular.eot
diff --git a/vmap/client/modules/vmap/css/lib/bootstrap/fonts/glyphicons-halflings-regular.svg b/src/vitis/client/css/lib/bootstrap/fonts/glyphicons-halflings-regular.svg
similarity index 100%
rename from vmap/client/modules/vmap/css/lib/bootstrap/fonts/glyphicons-halflings-regular.svg
rename to src/vitis/client/css/lib/bootstrap/fonts/glyphicons-halflings-regular.svg
diff --git a/vmap/client/modules/vmap/css/lib/bootstrap/fonts/glyphicons-halflings-regular.ttf b/src/vitis/client/css/lib/bootstrap/fonts/glyphicons-halflings-regular.ttf
similarity index 100%
rename from vmap/client/modules/vmap/css/lib/bootstrap/fonts/glyphicons-halflings-regular.ttf
rename to src/vitis/client/css/lib/bootstrap/fonts/glyphicons-halflings-regular.ttf
diff --git a/vmap/client/modules/vmap/css/lib/bootstrap/fonts/glyphicons-halflings-regular.woff b/src/vitis/client/css/lib/bootstrap/fonts/glyphicons-halflings-regular.woff
similarity index 100%
rename from vmap/client/modules/vmap/css/lib/bootstrap/fonts/glyphicons-halflings-regular.woff
rename to src/vitis/client/css/lib/bootstrap/fonts/glyphicons-halflings-regular.woff
diff --git a/vmap/client/modules/vmap/css/lib/bootstrap/fonts/glyphicons-halflings-regular.woff2 b/src/vitis/client/css/lib/bootstrap/fonts/glyphicons-halflings-regular.woff2
similarity index 100%
rename from vmap/client/modules/vmap/css/lib/bootstrap/fonts/glyphicons-halflings-regular.woff2
rename to src/vitis/client/css/lib/bootstrap/fonts/glyphicons-halflings-regular.woff2
diff --git a/vmap/client/css/lib/codemirror/codemirror.css b/src/vitis/client/css/lib/codemirror/codemirror.css
similarity index 100%
rename from vmap/client/css/lib/codemirror/codemirror.css
rename to src/vitis/client/css/lib/codemirror/codemirror.css
diff --git a/vmap/client/css/lib/codemirror/codemirror_foldgutter.css b/src/vitis/client/css/lib/codemirror/codemirror_foldgutter.css
similarity index 100%
rename from vmap/client/css/lib/codemirror/codemirror_foldgutter.css
rename to src/vitis/client/css/lib/codemirror/codemirror_foldgutter.css
diff --git a/vmap/client/css/lib/codemirror/dialog.css b/src/vitis/client/css/lib/codemirror/dialog.css
similarity index 100%
rename from vmap/client/css/lib/codemirror/dialog.css
rename to src/vitis/client/css/lib/codemirror/dialog.css
diff --git a/vmap/client/css/lib/codemirror/docs.css b/src/vitis/client/css/lib/codemirror/docs.css
similarity index 100%
rename from vmap/client/css/lib/codemirror/docs.css
rename to src/vitis/client/css/lib/codemirror/docs.css
diff --git a/vmap/client/css/lib/codemirror/map.css b/src/vitis/client/css/lib/codemirror/map.css
similarity index 100%
rename from vmap/client/css/lib/codemirror/map.css
rename to src/vitis/client/css/lib/codemirror/map.css
diff --git a/vmap/client/css/lib/codemirror/show-hint.css b/src/vitis/client/css/lib/codemirror/show-hint.css
similarity index 100%
rename from vmap/client/css/lib/codemirror/show-hint.css
rename to src/vitis/client/css/lib/codemirror/show-hint.css
diff --git a/vmap/client/css/lib/codemirror/theme/3024-day.css b/src/vitis/client/css/lib/codemirror/theme/3024-day.css
similarity index 100%
rename from vmap/client/css/lib/codemirror/theme/3024-day.css
rename to src/vitis/client/css/lib/codemirror/theme/3024-day.css
diff --git a/vmap/client/css/lib/codemirror/theme/3024-night.css b/src/vitis/client/css/lib/codemirror/theme/3024-night.css
similarity index 100%
rename from vmap/client/css/lib/codemirror/theme/3024-night.css
rename to src/vitis/client/css/lib/codemirror/theme/3024-night.css
diff --git a/vmap/client/css/lib/codemirror/theme/Veremes.css b/src/vitis/client/css/lib/codemirror/theme/Veremes.css
similarity index 100%
rename from vmap/client/css/lib/codemirror/theme/Veremes.css
rename to src/vitis/client/css/lib/codemirror/theme/Veremes.css
diff --git a/vmap/client/css/lib/codemirror/theme/abcdef.css b/src/vitis/client/css/lib/codemirror/theme/abcdef.css
similarity index 100%
rename from vmap/client/css/lib/codemirror/theme/abcdef.css
rename to src/vitis/client/css/lib/codemirror/theme/abcdef.css
diff --git a/vmap/client/css/lib/codemirror/theme/ambiance-mobile.css b/src/vitis/client/css/lib/codemirror/theme/ambiance-mobile.css
similarity index 100%
rename from vmap/client/css/lib/codemirror/theme/ambiance-mobile.css
rename to src/vitis/client/css/lib/codemirror/theme/ambiance-mobile.css
diff --git a/vmap/client/css/lib/codemirror/theme/ambiance.css b/src/vitis/client/css/lib/codemirror/theme/ambiance.css
similarity index 100%
rename from vmap/client/css/lib/codemirror/theme/ambiance.css
rename to src/vitis/client/css/lib/codemirror/theme/ambiance.css
diff --git a/vmap/client/css/lib/codemirror/theme/base16-dark.css b/src/vitis/client/css/lib/codemirror/theme/base16-dark.css
similarity index 100%
rename from vmap/client/css/lib/codemirror/theme/base16-dark.css
rename to src/vitis/client/css/lib/codemirror/theme/base16-dark.css
diff --git a/vmap/client/css/lib/codemirror/theme/base16-light.css b/src/vitis/client/css/lib/codemirror/theme/base16-light.css
similarity index 100%
rename from vmap/client/css/lib/codemirror/theme/base16-light.css
rename to src/vitis/client/css/lib/codemirror/theme/base16-light.css
diff --git a/vmap/client/css/lib/codemirror/theme/bespin.css b/src/vitis/client/css/lib/codemirror/theme/bespin.css
similarity index 100%
rename from vmap/client/css/lib/codemirror/theme/bespin.css
rename to src/vitis/client/css/lib/codemirror/theme/bespin.css
diff --git a/vmap/client/css/lib/codemirror/theme/blackboard.css b/src/vitis/client/css/lib/codemirror/theme/blackboard.css
similarity index 100%
rename from vmap/client/css/lib/codemirror/theme/blackboard.css
rename to src/vitis/client/css/lib/codemirror/theme/blackboard.css
diff --git a/vmap/client/css/lib/codemirror/theme/cobalt.css b/src/vitis/client/css/lib/codemirror/theme/cobalt.css
similarity index 100%
rename from vmap/client/css/lib/codemirror/theme/cobalt.css
rename to src/vitis/client/css/lib/codemirror/theme/cobalt.css
diff --git a/vmap/client/css/lib/codemirror/theme/colorforth.css b/src/vitis/client/css/lib/codemirror/theme/colorforth.css
similarity index 100%
rename from vmap/client/css/lib/codemirror/theme/colorforth.css
rename to src/vitis/client/css/lib/codemirror/theme/colorforth.css
diff --git a/vmap/client/css/lib/codemirror/theme/dracula.css b/src/vitis/client/css/lib/codemirror/theme/dracula.css
similarity index 100%
rename from vmap/client/css/lib/codemirror/theme/dracula.css
rename to src/vitis/client/css/lib/codemirror/theme/dracula.css
diff --git a/vmap/client/css/lib/codemirror/theme/eclipse.css b/src/vitis/client/css/lib/codemirror/theme/eclipse.css
similarity index 100%
rename from vmap/client/css/lib/codemirror/theme/eclipse.css
rename to src/vitis/client/css/lib/codemirror/theme/eclipse.css
diff --git a/vmap/client/css/lib/codemirror/theme/elegant.css b/src/vitis/client/css/lib/codemirror/theme/elegant.css
similarity index 100%
rename from vmap/client/css/lib/codemirror/theme/elegant.css
rename to src/vitis/client/css/lib/codemirror/theme/elegant.css
diff --git a/vmap/client/css/lib/codemirror/theme/erlang-dark.css b/src/vitis/client/css/lib/codemirror/theme/erlang-dark.css
similarity index 100%
rename from vmap/client/css/lib/codemirror/theme/erlang-dark.css
rename to src/vitis/client/css/lib/codemirror/theme/erlang-dark.css
diff --git a/vmap/client/css/lib/codemirror/theme/hopscotch.css b/src/vitis/client/css/lib/codemirror/theme/hopscotch.css
similarity index 100%
rename from vmap/client/css/lib/codemirror/theme/hopscotch.css
rename to src/vitis/client/css/lib/codemirror/theme/hopscotch.css
diff --git a/vmap/client/css/lib/codemirror/theme/icecoder.css b/src/vitis/client/css/lib/codemirror/theme/icecoder.css
similarity index 100%
rename from vmap/client/css/lib/codemirror/theme/icecoder.css
rename to src/vitis/client/css/lib/codemirror/theme/icecoder.css
diff --git a/vmap/client/css/lib/codemirror/theme/isotope.css b/src/vitis/client/css/lib/codemirror/theme/isotope.css
similarity index 100%
rename from vmap/client/css/lib/codemirror/theme/isotope.css
rename to src/vitis/client/css/lib/codemirror/theme/isotope.css
diff --git a/vmap/client/css/lib/codemirror/theme/lesser-dark.css b/src/vitis/client/css/lib/codemirror/theme/lesser-dark.css
similarity index 100%
rename from vmap/client/css/lib/codemirror/theme/lesser-dark.css
rename to src/vitis/client/css/lib/codemirror/theme/lesser-dark.css
diff --git a/vmap/client/css/lib/codemirror/theme/liquibyte.css b/src/vitis/client/css/lib/codemirror/theme/liquibyte.css
similarity index 100%
rename from vmap/client/css/lib/codemirror/theme/liquibyte.css
rename to src/vitis/client/css/lib/codemirror/theme/liquibyte.css
diff --git a/vmap/client/css/lib/codemirror/theme/material.css b/src/vitis/client/css/lib/codemirror/theme/material.css
similarity index 100%
rename from vmap/client/css/lib/codemirror/theme/material.css
rename to src/vitis/client/css/lib/codemirror/theme/material.css
diff --git a/vmap/client/css/lib/codemirror/theme/mbo.css b/src/vitis/client/css/lib/codemirror/theme/mbo.css
similarity index 100%
rename from vmap/client/css/lib/codemirror/theme/mbo.css
rename to src/vitis/client/css/lib/codemirror/theme/mbo.css
diff --git a/vmap/client/css/lib/codemirror/theme/mdn-like.css b/src/vitis/client/css/lib/codemirror/theme/mdn-like.css
similarity index 100%
rename from vmap/client/css/lib/codemirror/theme/mdn-like.css
rename to src/vitis/client/css/lib/codemirror/theme/mdn-like.css
diff --git a/vmap/client/css/lib/codemirror/theme/midnight.css b/src/vitis/client/css/lib/codemirror/theme/midnight.css
similarity index 100%
rename from vmap/client/css/lib/codemirror/theme/midnight.css
rename to src/vitis/client/css/lib/codemirror/theme/midnight.css
diff --git a/vmap/client/css/lib/codemirror/theme/monokai.css b/src/vitis/client/css/lib/codemirror/theme/monokai.css
similarity index 100%
rename from vmap/client/css/lib/codemirror/theme/monokai.css
rename to src/vitis/client/css/lib/codemirror/theme/monokai.css
diff --git a/vmap/client/css/lib/codemirror/theme/neat.css b/src/vitis/client/css/lib/codemirror/theme/neat.css
similarity index 100%
rename from vmap/client/css/lib/codemirror/theme/neat.css
rename to src/vitis/client/css/lib/codemirror/theme/neat.css
diff --git a/vmap/client/css/lib/codemirror/theme/neo.css b/src/vitis/client/css/lib/codemirror/theme/neo.css
similarity index 100%
rename from vmap/client/css/lib/codemirror/theme/neo.css
rename to src/vitis/client/css/lib/codemirror/theme/neo.css
diff --git a/vmap/client/css/lib/codemirror/theme/night.css b/src/vitis/client/css/lib/codemirror/theme/night.css
similarity index 100%
rename from vmap/client/css/lib/codemirror/theme/night.css
rename to src/vitis/client/css/lib/codemirror/theme/night.css
diff --git a/vmap/client/css/lib/codemirror/theme/paraiso-dark.css b/src/vitis/client/css/lib/codemirror/theme/paraiso-dark.css
similarity index 100%
rename from vmap/client/css/lib/codemirror/theme/paraiso-dark.css
rename to src/vitis/client/css/lib/codemirror/theme/paraiso-dark.css
diff --git a/vmap/client/css/lib/codemirror/theme/paraiso-light.css b/src/vitis/client/css/lib/codemirror/theme/paraiso-light.css
similarity index 100%
rename from vmap/client/css/lib/codemirror/theme/paraiso-light.css
rename to src/vitis/client/css/lib/codemirror/theme/paraiso-light.css
diff --git a/vmap/client/css/lib/codemirror/theme/pastel-on-dark.css b/src/vitis/client/css/lib/codemirror/theme/pastel-on-dark.css
similarity index 100%
rename from vmap/client/css/lib/codemirror/theme/pastel-on-dark.css
rename to src/vitis/client/css/lib/codemirror/theme/pastel-on-dark.css
diff --git a/vmap/client/css/lib/codemirror/theme/railscasts.css b/src/vitis/client/css/lib/codemirror/theme/railscasts.css
similarity index 100%
rename from vmap/client/css/lib/codemirror/theme/railscasts.css
rename to src/vitis/client/css/lib/codemirror/theme/railscasts.css
diff --git a/vmap/client/css/lib/codemirror/theme/rubyblue.css b/src/vitis/client/css/lib/codemirror/theme/rubyblue.css
similarity index 100%
rename from vmap/client/css/lib/codemirror/theme/rubyblue.css
rename to src/vitis/client/css/lib/codemirror/theme/rubyblue.css
diff --git a/vmap/client/css/lib/codemirror/theme/seti.css b/src/vitis/client/css/lib/codemirror/theme/seti.css
similarity index 100%
rename from vmap/client/css/lib/codemirror/theme/seti.css
rename to src/vitis/client/css/lib/codemirror/theme/seti.css
diff --git a/vmap/client/css/lib/codemirror/theme/solarized.css b/src/vitis/client/css/lib/codemirror/theme/solarized.css
similarity index 100%
rename from vmap/client/css/lib/codemirror/theme/solarized.css
rename to src/vitis/client/css/lib/codemirror/theme/solarized.css
diff --git a/vmap/client/css/lib/codemirror/theme/the-matrix.css b/src/vitis/client/css/lib/codemirror/theme/the-matrix.css
similarity index 100%
rename from vmap/client/css/lib/codemirror/theme/the-matrix.css
rename to src/vitis/client/css/lib/codemirror/theme/the-matrix.css
diff --git a/vmap/client/css/lib/codemirror/theme/tomorrow-night-bright.css b/src/vitis/client/css/lib/codemirror/theme/tomorrow-night-bright.css
similarity index 100%
rename from vmap/client/css/lib/codemirror/theme/tomorrow-night-bright.css
rename to src/vitis/client/css/lib/codemirror/theme/tomorrow-night-bright.css
diff --git a/vmap/client/css/lib/codemirror/theme/tomorrow-night-eighties.css b/src/vitis/client/css/lib/codemirror/theme/tomorrow-night-eighties.css
similarity index 100%
rename from vmap/client/css/lib/codemirror/theme/tomorrow-night-eighties.css
rename to src/vitis/client/css/lib/codemirror/theme/tomorrow-night-eighties.css
diff --git a/vmap/client/css/lib/codemirror/theme/ttcn.css b/src/vitis/client/css/lib/codemirror/theme/ttcn.css
similarity index 100%
rename from vmap/client/css/lib/codemirror/theme/ttcn.css
rename to src/vitis/client/css/lib/codemirror/theme/ttcn.css
diff --git a/vmap/client/css/lib/codemirror/theme/twilight.css b/src/vitis/client/css/lib/codemirror/theme/twilight.css
similarity index 100%
rename from vmap/client/css/lib/codemirror/theme/twilight.css
rename to src/vitis/client/css/lib/codemirror/theme/twilight.css
diff --git a/vmap/client/css/lib/codemirror/theme/vibrant-ink.css b/src/vitis/client/css/lib/codemirror/theme/vibrant-ink.css
similarity index 100%
rename from vmap/client/css/lib/codemirror/theme/vibrant-ink.css
rename to src/vitis/client/css/lib/codemirror/theme/vibrant-ink.css
diff --git a/vmap/client/css/lib/codemirror/theme/xq-dark.css b/src/vitis/client/css/lib/codemirror/theme/xq-dark.css
similarity index 100%
rename from vmap/client/css/lib/codemirror/theme/xq-dark.css
rename to src/vitis/client/css/lib/codemirror/theme/xq-dark.css
diff --git a/vmap/client/css/lib/codemirror/theme/xq-light.css b/src/vitis/client/css/lib/codemirror/theme/xq-light.css
similarity index 100%
rename from vmap/client/css/lib/codemirror/theme/xq-light.css
rename to src/vitis/client/css/lib/codemirror/theme/xq-light.css
diff --git a/vmap/client/css/lib/codemirror/theme/yeti.css b/src/vitis/client/css/lib/codemirror/theme/yeti.css
similarity index 100%
rename from vmap/client/css/lib/codemirror/theme/yeti.css
rename to src/vitis/client/css/lib/codemirror/theme/yeti.css
diff --git a/vmap/client/css/lib/codemirror/theme/zenburn.css b/src/vitis/client/css/lib/codemirror/theme/zenburn.css
similarity index 100%
rename from vmap/client/css/lib/codemirror/theme/zenburn.css
rename to src/vitis/client/css/lib/codemirror/theme/zenburn.css
diff --git a/vmap/client/css/lib/font-awesome/HELP-US-OUT.txt b/src/vitis/client/css/lib/font-awesome/HELP-US-OUT.txt
similarity index 100%
rename from vmap/client/css/lib/font-awesome/HELP-US-OUT.txt
rename to src/vitis/client/css/lib/font-awesome/HELP-US-OUT.txt
diff --git a/vmap/client/css/lib/font-awesome/css/font-awesome.css b/src/vitis/client/css/lib/font-awesome/css/font-awesome.css
similarity index 100%
rename from vmap/client/css/lib/font-awesome/css/font-awesome.css
rename to src/vitis/client/css/lib/font-awesome/css/font-awesome.css
diff --git a/vmap/client/css/lib/font-awesome/css/font-awesome.min.css b/src/vitis/client/css/lib/font-awesome/css/font-awesome.min.css
similarity index 100%
rename from vmap/client/css/lib/font-awesome/css/font-awesome.min.css
rename to src/vitis/client/css/lib/font-awesome/css/font-awesome.min.css
diff --git a/vmap/client/css/lib/font-awesome/fonts/FontAwesome.otf b/src/vitis/client/css/lib/font-awesome/fonts/FontAwesome.otf
similarity index 100%
rename from vmap/client/css/lib/font-awesome/fonts/FontAwesome.otf
rename to src/vitis/client/css/lib/font-awesome/fonts/FontAwesome.otf
diff --git a/vmap/client/css/lib/font-awesome/fonts/fontawesome-webfont.eot b/src/vitis/client/css/lib/font-awesome/fonts/fontawesome-webfont.eot
similarity index 100%
rename from vmap/client/css/lib/font-awesome/fonts/fontawesome-webfont.eot
rename to src/vitis/client/css/lib/font-awesome/fonts/fontawesome-webfont.eot
diff --git a/vmap/client/css/lib/font-awesome/fonts/fontawesome-webfont.svg b/src/vitis/client/css/lib/font-awesome/fonts/fontawesome-webfont.svg
similarity index 100%
rename from vmap/client/css/lib/font-awesome/fonts/fontawesome-webfont.svg
rename to src/vitis/client/css/lib/font-awesome/fonts/fontawesome-webfont.svg
diff --git a/vmap/client/css/lib/font-awesome/fonts/fontawesome-webfont.ttf b/src/vitis/client/css/lib/font-awesome/fonts/fontawesome-webfont.ttf
similarity index 100%
rename from vmap/client/css/lib/font-awesome/fonts/fontawesome-webfont.ttf
rename to src/vitis/client/css/lib/font-awesome/fonts/fontawesome-webfont.ttf
diff --git a/vmap/client/css/lib/font-awesome/fonts/fontawesome-webfont.woff b/src/vitis/client/css/lib/font-awesome/fonts/fontawesome-webfont.woff
similarity index 100%
rename from vmap/client/css/lib/font-awesome/fonts/fontawesome-webfont.woff
rename to src/vitis/client/css/lib/font-awesome/fonts/fontawesome-webfont.woff
diff --git a/vmap/client/css/lib/font-awesome/fonts/fontawesome-webfont.woff2 b/src/vitis/client/css/lib/font-awesome/fonts/fontawesome-webfont.woff2
similarity index 100%
rename from vmap/client/css/lib/font-awesome/fonts/fontawesome-webfont.woff2
rename to src/vitis/client/css/lib/font-awesome/fonts/fontawesome-webfont.woff2
diff --git a/vmap/client/css/lib/font-awesome/less/animated.less b/src/vitis/client/css/lib/font-awesome/less/animated.less
similarity index 100%
rename from vmap/client/css/lib/font-awesome/less/animated.less
rename to src/vitis/client/css/lib/font-awesome/less/animated.less
diff --git a/vmap/client/css/lib/font-awesome/less/bordered-pulled.less b/src/vitis/client/css/lib/font-awesome/less/bordered-pulled.less
similarity index 100%
rename from vmap/client/css/lib/font-awesome/less/bordered-pulled.less
rename to src/vitis/client/css/lib/font-awesome/less/bordered-pulled.less
diff --git a/vmap/client/css/lib/font-awesome/less/core.less b/src/vitis/client/css/lib/font-awesome/less/core.less
similarity index 100%
rename from vmap/client/css/lib/font-awesome/less/core.less
rename to src/vitis/client/css/lib/font-awesome/less/core.less
diff --git a/vmap/client/css/lib/font-awesome/less/fixed-width.less b/src/vitis/client/css/lib/font-awesome/less/fixed-width.less
similarity index 100%
rename from vmap/client/css/lib/font-awesome/less/fixed-width.less
rename to src/vitis/client/css/lib/font-awesome/less/fixed-width.less
diff --git a/vmap/client/css/lib/font-awesome/less/font-awesome.less b/src/vitis/client/css/lib/font-awesome/less/font-awesome.less
similarity index 100%
rename from vmap/client/css/lib/font-awesome/less/font-awesome.less
rename to src/vitis/client/css/lib/font-awesome/less/font-awesome.less
diff --git a/vmap/client/css/lib/font-awesome/less/icons.less b/src/vitis/client/css/lib/font-awesome/less/icons.less
similarity index 100%
rename from vmap/client/css/lib/font-awesome/less/icons.less
rename to src/vitis/client/css/lib/font-awesome/less/icons.less
diff --git a/vmap/client/css/lib/font-awesome/less/larger.less b/src/vitis/client/css/lib/font-awesome/less/larger.less
similarity index 100%
rename from vmap/client/css/lib/font-awesome/less/larger.less
rename to src/vitis/client/css/lib/font-awesome/less/larger.less
diff --git a/vmap/client/css/lib/font-awesome/less/list.less b/src/vitis/client/css/lib/font-awesome/less/list.less
similarity index 100%
rename from vmap/client/css/lib/font-awesome/less/list.less
rename to src/vitis/client/css/lib/font-awesome/less/list.less
diff --git a/vmap/client/css/lib/font-awesome/less/mixins.less b/src/vitis/client/css/lib/font-awesome/less/mixins.less
similarity index 100%
rename from vmap/client/css/lib/font-awesome/less/mixins.less
rename to src/vitis/client/css/lib/font-awesome/less/mixins.less
diff --git a/vmap/client/css/lib/font-awesome/less/path.less b/src/vitis/client/css/lib/font-awesome/less/path.less
similarity index 100%
rename from vmap/client/css/lib/font-awesome/less/path.less
rename to src/vitis/client/css/lib/font-awesome/less/path.less
diff --git a/vmap/client/css/lib/font-awesome/less/rotated-flipped.less b/src/vitis/client/css/lib/font-awesome/less/rotated-flipped.less
similarity index 100%
rename from vmap/client/css/lib/font-awesome/less/rotated-flipped.less
rename to src/vitis/client/css/lib/font-awesome/less/rotated-flipped.less
diff --git a/vmap/client/css/lib/font-awesome/less/stacked.less b/src/vitis/client/css/lib/font-awesome/less/stacked.less
similarity index 100%
rename from vmap/client/css/lib/font-awesome/less/stacked.less
rename to src/vitis/client/css/lib/font-awesome/less/stacked.less
diff --git a/vmap/client/css/lib/font-awesome/less/variables.less b/src/vitis/client/css/lib/font-awesome/less/variables.less
similarity index 100%
rename from vmap/client/css/lib/font-awesome/less/variables.less
rename to src/vitis/client/css/lib/font-awesome/less/variables.less
diff --git a/vmap/client/css/lib/font-awesome/scss/_animated.scss b/src/vitis/client/css/lib/font-awesome/scss/_animated.scss
similarity index 100%
rename from vmap/client/css/lib/font-awesome/scss/_animated.scss
rename to src/vitis/client/css/lib/font-awesome/scss/_animated.scss
diff --git a/vmap/client/css/lib/font-awesome/scss/_bordered-pulled.scss b/src/vitis/client/css/lib/font-awesome/scss/_bordered-pulled.scss
similarity index 100%
rename from vmap/client/css/lib/font-awesome/scss/_bordered-pulled.scss
rename to src/vitis/client/css/lib/font-awesome/scss/_bordered-pulled.scss
diff --git a/vmap/client/css/lib/font-awesome/scss/_core.scss b/src/vitis/client/css/lib/font-awesome/scss/_core.scss
similarity index 100%
rename from vmap/client/css/lib/font-awesome/scss/_core.scss
rename to src/vitis/client/css/lib/font-awesome/scss/_core.scss
diff --git a/vmap/client/css/lib/font-awesome/scss/_fixed-width.scss b/src/vitis/client/css/lib/font-awesome/scss/_fixed-width.scss
similarity index 100%
rename from vmap/client/css/lib/font-awesome/scss/_fixed-width.scss
rename to src/vitis/client/css/lib/font-awesome/scss/_fixed-width.scss
diff --git a/vmap/client/css/lib/font-awesome/scss/_icons.scss b/src/vitis/client/css/lib/font-awesome/scss/_icons.scss
similarity index 100%
rename from vmap/client/css/lib/font-awesome/scss/_icons.scss
rename to src/vitis/client/css/lib/font-awesome/scss/_icons.scss
diff --git a/vmap/client/css/lib/font-awesome/scss/_larger.scss b/src/vitis/client/css/lib/font-awesome/scss/_larger.scss
similarity index 100%
rename from vmap/client/css/lib/font-awesome/scss/_larger.scss
rename to src/vitis/client/css/lib/font-awesome/scss/_larger.scss
diff --git a/vmap/client/css/lib/font-awesome/scss/_list.scss b/src/vitis/client/css/lib/font-awesome/scss/_list.scss
similarity index 100%
rename from vmap/client/css/lib/font-awesome/scss/_list.scss
rename to src/vitis/client/css/lib/font-awesome/scss/_list.scss
diff --git a/vmap/client/css/lib/font-awesome/scss/_mixins.scss b/src/vitis/client/css/lib/font-awesome/scss/_mixins.scss
similarity index 100%
rename from vmap/client/css/lib/font-awesome/scss/_mixins.scss
rename to src/vitis/client/css/lib/font-awesome/scss/_mixins.scss
diff --git a/vmap/client/css/lib/font-awesome/scss/_path.scss b/src/vitis/client/css/lib/font-awesome/scss/_path.scss
similarity index 100%
rename from vmap/client/css/lib/font-awesome/scss/_path.scss
rename to src/vitis/client/css/lib/font-awesome/scss/_path.scss
diff --git a/vmap/client/css/lib/font-awesome/scss/_rotated-flipped.scss b/src/vitis/client/css/lib/font-awesome/scss/_rotated-flipped.scss
similarity index 100%
rename from vmap/client/css/lib/font-awesome/scss/_rotated-flipped.scss
rename to src/vitis/client/css/lib/font-awesome/scss/_rotated-flipped.scss
diff --git a/vmap/client/css/lib/font-awesome/scss/_stacked.scss b/src/vitis/client/css/lib/font-awesome/scss/_stacked.scss
similarity index 100%
rename from vmap/client/css/lib/font-awesome/scss/_stacked.scss
rename to src/vitis/client/css/lib/font-awesome/scss/_stacked.scss
diff --git a/vmap/client/css/lib/font-awesome/scss/_variables.scss b/src/vitis/client/css/lib/font-awesome/scss/_variables.scss
similarity index 100%
rename from vmap/client/css/lib/font-awesome/scss/_variables.scss
rename to src/vitis/client/css/lib/font-awesome/scss/_variables.scss
diff --git a/vmap/client/css/lib/font-awesome/scss/font-awesome.scss b/src/vitis/client/css/lib/font-awesome/scss/font-awesome.scss
similarity index 100%
rename from vmap/client/css/lib/font-awesome/scss/font-awesome.scss
rename to src/vitis/client/css/lib/font-awesome/scss/font-awesome.scss
diff --git a/vmap/client/modules/vmap/css/lib/fonts/FontAwesome.otf b/src/vitis/client/css/lib/fonts/FontAwesome.otf
similarity index 100%
rename from vmap/client/modules/vmap/css/lib/fonts/FontAwesome.otf
rename to src/vitis/client/css/lib/fonts/FontAwesome.otf
diff --git a/vmap/client/modules/vmap/css/lib/fonts/fontawesome-webfont.eot b/src/vitis/client/css/lib/fonts/fontawesome-webfont.eot
similarity index 100%
rename from vmap/client/modules/vmap/css/lib/fonts/fontawesome-webfont.eot
rename to src/vitis/client/css/lib/fonts/fontawesome-webfont.eot
diff --git a/vmap/client/modules/vmap/css/lib/fonts/fontawesome-webfont.svg b/src/vitis/client/css/lib/fonts/fontawesome-webfont.svg
similarity index 100%
rename from vmap/client/modules/vmap/css/lib/fonts/fontawesome-webfont.svg
rename to src/vitis/client/css/lib/fonts/fontawesome-webfont.svg
diff --git a/vmap/client/modules/vmap/css/lib/fonts/fontawesome-webfont.ttf b/src/vitis/client/css/lib/fonts/fontawesome-webfont.ttf
similarity index 100%
rename from vmap/client/modules/vmap/css/lib/fonts/fontawesome-webfont.ttf
rename to src/vitis/client/css/lib/fonts/fontawesome-webfont.ttf
diff --git a/vmap/client/modules/vmap/css/lib/fonts/fontawesome-webfont.woff b/src/vitis/client/css/lib/fonts/fontawesome-webfont.woff
similarity index 100%
rename from vmap/client/modules/vmap/css/lib/fonts/fontawesome-webfont.woff
rename to src/vitis/client/css/lib/fonts/fontawesome-webfont.woff
diff --git a/vmap/client/modules/vmap/css/lib/fonts/fontawesome-webfont.woff2 b/src/vitis/client/css/lib/fonts/fontawesome-webfont.woff2
similarity index 100%
rename from vmap/client/modules/vmap/css/lib/fonts/fontawesome-webfont.woff2
rename to src/vitis/client/css/lib/fonts/fontawesome-webfont.woff2
diff --git a/vmap/client/modules/vmap/css/lib/fonts/glyphicons-halflings-regular.eot b/src/vitis/client/css/lib/fonts/glyphicons-halflings-regular.eot
similarity index 100%
rename from vmap/client/modules/vmap/css/lib/fonts/glyphicons-halflings-regular.eot
rename to src/vitis/client/css/lib/fonts/glyphicons-halflings-regular.eot
diff --git a/vmap/client/modules/vmap/css/lib/fonts/glyphicons-halflings-regular.svg b/src/vitis/client/css/lib/fonts/glyphicons-halflings-regular.svg
similarity index 100%
rename from vmap/client/modules/vmap/css/lib/fonts/glyphicons-halflings-regular.svg
rename to src/vitis/client/css/lib/fonts/glyphicons-halflings-regular.svg
diff --git a/vmap/client/modules/vmap/css/lib/fonts/glyphicons-halflings-regular.ttf b/src/vitis/client/css/lib/fonts/glyphicons-halflings-regular.ttf
similarity index 100%
rename from vmap/client/modules/vmap/css/lib/fonts/glyphicons-halflings-regular.ttf
rename to src/vitis/client/css/lib/fonts/glyphicons-halflings-regular.ttf
diff --git a/vmap/client/modules/vmap/css/lib/fonts/glyphicons-halflings-regular.woff b/src/vitis/client/css/lib/fonts/glyphicons-halflings-regular.woff
similarity index 100%
rename from vmap/client/modules/vmap/css/lib/fonts/glyphicons-halflings-regular.woff
rename to src/vitis/client/css/lib/fonts/glyphicons-halflings-regular.woff
diff --git a/vmap/client/modules/vmap/css/lib/fonts/glyphicons-halflings-regular.woff2 b/src/vitis/client/css/lib/fonts/glyphicons-halflings-regular.woff2
similarity index 100%
rename from vmap/client/modules/vmap/css/lib/fonts/glyphicons-halflings-regular.woff2
rename to src/vitis/client/css/lib/fonts/glyphicons-halflings-regular.woff2
diff --git a/vmap/client/modules/vmap/css/lib/colorpicker/css/bootstrap-colorpicker.min.css b/src/vitis/client/css/lib/jquery/plugins/bootstrap-colorpicker/css/bootstrap-colorpicker.min.css
similarity index 100%
rename from vmap/client/modules/vmap/css/lib/colorpicker/css/bootstrap-colorpicker.min.css
rename to src/vitis/client/css/lib/jquery/plugins/bootstrap-colorpicker/css/bootstrap-colorpicker.min.css
diff --git a/vmap/client/modules/vmap/css/lib/colorpicker/img/bootstrap-colorpicker/alpha-horizontal.png b/src/vitis/client/css/lib/jquery/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha-horizontal.png
similarity index 100%
rename from vmap/client/modules/vmap/css/lib/colorpicker/img/bootstrap-colorpicker/alpha-horizontal.png
rename to src/vitis/client/css/lib/jquery/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha-horizontal.png
diff --git a/vmap/client/modules/vmap/css/lib/colorpicker/img/bootstrap-colorpicker/alpha.png b/src/vitis/client/css/lib/jquery/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha.png
similarity index 100%
rename from vmap/client/modules/vmap/css/lib/colorpicker/img/bootstrap-colorpicker/alpha.png
rename to src/vitis/client/css/lib/jquery/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha.png
diff --git a/vmap/client/modules/vmap/css/lib/colorpicker/img/bootstrap-colorpicker/hue-horizontal.png b/src/vitis/client/css/lib/jquery/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/hue-horizontal.png
similarity index 100%
rename from vmap/client/modules/vmap/css/lib/colorpicker/img/bootstrap-colorpicker/hue-horizontal.png
rename to src/vitis/client/css/lib/jquery/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/hue-horizontal.png
diff --git a/vmap/client/modules/vmap/css/lib/colorpicker/img/bootstrap-colorpicker/hue.png b/src/vitis/client/css/lib/jquery/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/hue.png
similarity index 100%
rename from vmap/client/modules/vmap/css/lib/colorpicker/img/bootstrap-colorpicker/hue.png
rename to src/vitis/client/css/lib/jquery/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/hue.png
diff --git a/vmap/client/modules/vmap/css/lib/colorpicker/img/bootstrap-colorpicker/saturation.png b/src/vitis/client/css/lib/jquery/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/saturation.png
similarity index 100%
rename from vmap/client/modules/vmap/css/lib/colorpicker/img/bootstrap-colorpicker/saturation.png
rename to src/vitis/client/css/lib/jquery/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/saturation.png
diff --git a/vmap/client/css/lib/jquery/plugins/bootstrap-datepicker/bootstrap-datepicker3.css b/src/vitis/client/css/lib/jquery/plugins/bootstrap-datepicker/bootstrap-datepicker3.css
similarity index 100%
rename from vmap/client/css/lib/jquery/plugins/bootstrap-datepicker/bootstrap-datepicker3.css
rename to src/vitis/client/css/lib/jquery/plugins/bootstrap-datepicker/bootstrap-datepicker3.css
diff --git a/vmap/client/css/lib/jquery/plugins/bootstrap-datepicker/bootstrap-datepicker3.min.css b/src/vitis/client/css/lib/jquery/plugins/bootstrap-datepicker/bootstrap-datepicker3.min.css
similarity index 100%
rename from vmap/client/css/lib/jquery/plugins/bootstrap-datepicker/bootstrap-datepicker3.min.css
rename to src/vitis/client/css/lib/jquery/plugins/bootstrap-datepicker/bootstrap-datepicker3.min.css
diff --git a/vmap/client/css/lib/jquery/plugins/bootstrap-fileinput/css/fileinput.css b/src/vitis/client/css/lib/jquery/plugins/bootstrap-fileinput/css/fileinput.css
similarity index 100%
rename from vmap/client/css/lib/jquery/plugins/bootstrap-fileinput/css/fileinput.css
rename to src/vitis/client/css/lib/jquery/plugins/bootstrap-fileinput/css/fileinput.css
diff --git a/vmap/client/css/lib/jquery/plugins/bootstrap-fileinput/css/fileinput.min.css b/src/vitis/client/css/lib/jquery/plugins/bootstrap-fileinput/css/fileinput.min.css
similarity index 100%
rename from vmap/client/css/lib/jquery/plugins/bootstrap-fileinput/css/fileinput.min.css
rename to src/vitis/client/css/lib/jquery/plugins/bootstrap-fileinput/css/fileinput.min.css
diff --git a/vmap/client/css/lib/jquery/plugins/bootstrap-fileinput/img/loading-sm.gif b/src/vitis/client/css/lib/jquery/plugins/bootstrap-fileinput/img/loading-sm.gif
similarity index 100%
rename from vmap/client/css/lib/jquery/plugins/bootstrap-fileinput/img/loading-sm.gif
rename to src/vitis/client/css/lib/jquery/plugins/bootstrap-fileinput/img/loading-sm.gif
diff --git a/vmap/client/css/lib/jquery/plugins/bootstrap-fileinput/img/loading.gif b/src/vitis/client/css/lib/jquery/plugins/bootstrap-fileinput/img/loading.gif
similarity index 100%
rename from vmap/client/css/lib/jquery/plugins/bootstrap-fileinput/img/loading.gif
rename to src/vitis/client/css/lib/jquery/plugins/bootstrap-fileinput/img/loading.gif
diff --git a/vmap/client/css/lib/jquery/plugins/bootstrap-slider/bootstrap-slider.min.css b/src/vitis/client/css/lib/jquery/plugins/bootstrap-slider/bootstrap-slider.min.css
similarity index 100%
rename from vmap/client/css/lib/jquery/plugins/bootstrap-slider/bootstrap-slider.min.css
rename to src/vitis/client/css/lib/jquery/plugins/bootstrap-slider/bootstrap-slider.min.css
diff --git a/vmap/client/css/lib/jquery/plugins/bootstrap-tagsinput/bootstrap-tagsinput.css b/src/vitis/client/css/lib/jquery/plugins/bootstrap-tagsinput/bootstrap-tagsinput.css
similarity index 100%
rename from vmap/client/css/lib/jquery/plugins/bootstrap-tagsinput/bootstrap-tagsinput.css
rename to src/vitis/client/css/lib/jquery/plugins/bootstrap-tagsinput/bootstrap-tagsinput.css
diff --git a/vmap/client/css/lib/jquery/plugins/bootstrap-treeview/bootstrap-treeview.css b/src/vitis/client/css/lib/jquery/plugins/bootstrap-treeview/bootstrap-treeview.css
similarity index 100%
rename from vmap/client/css/lib/jquery/plugins/bootstrap-treeview/bootstrap-treeview.css
rename to src/vitis/client/css/lib/jquery/plugins/bootstrap-treeview/bootstrap-treeview.css
diff --git a/vmap/client/css/lib/jquery/plugins/bootstrap-treeview/bootstrap-treeview.min.css b/src/vitis/client/css/lib/jquery/plugins/bootstrap-treeview/bootstrap-treeview.min.css
similarity index 100%
rename from vmap/client/css/lib/jquery/plugins/bootstrap-treeview/bootstrap-treeview.min.css
rename to src/vitis/client/css/lib/jquery/plugins/bootstrap-treeview/bootstrap-treeview.min.css
diff --git a/vmap/client/css/lib/jquery/plugins/malihu-custom-scrollbar/jquery.mCustomScrollbar.min.css b/src/vitis/client/css/lib/jquery/plugins/malihu-custom-scrollbar/jquery.mCustomScrollbar.min.css
similarity index 100%
rename from vmap/client/css/lib/jquery/plugins/malihu-custom-scrollbar/jquery.mCustomScrollbar.min.css
rename to src/vitis/client/css/lib/jquery/plugins/malihu-custom-scrollbar/jquery.mCustomScrollbar.min.css
diff --git a/vmap/client/css/lib/materialize/materialize.css b/src/vitis/client/css/lib/materialize/materialize.css
similarity index 100%
rename from vmap/client/css/lib/materialize/materialize.css
rename to src/vitis/client/css/lib/materialize/materialize.css
diff --git a/vmap/client/css/lib/materialize/materialize.min.css b/src/vitis/client/css/lib/materialize/materialize.min.css
similarity index 100%
rename from vmap/client/css/lib/materialize/materialize.min.css
rename to src/vitis/client/css/lib/materialize/materialize.min.css
diff --git a/vmap/client/css/lib/openlayers/ol.css b/src/vitis/client/css/lib/openlayers/ol.css
similarity index 100%
rename from vmap/client/css/lib/openlayers/ol.css
rename to src/vitis/client/css/lib/openlayers/ol.css
diff --git a/vmap/client/css/lib/ui-grid/plugins/draggable-rows.less b/src/vitis/client/css/lib/ui-grid/plugins/draggable-rows.less
similarity index 100%
rename from vmap/client/css/lib/ui-grid/plugins/draggable-rows.less
rename to src/vitis/client/css/lib/ui-grid/plugins/draggable-rows.less
diff --git a/vmap/client/css/lib/ui-grid/ui-grid.css b/src/vitis/client/css/lib/ui-grid/ui-grid.css
similarity index 100%
rename from vmap/client/css/lib/ui-grid/ui-grid.css
rename to src/vitis/client/css/lib/ui-grid/ui-grid.css
diff --git a/vmap/client/css/lib/ui-grid/ui-grid.eot b/src/vitis/client/css/lib/ui-grid/ui-grid.eot
similarity index 100%
rename from vmap/client/css/lib/ui-grid/ui-grid.eot
rename to src/vitis/client/css/lib/ui-grid/ui-grid.eot
diff --git a/vmap/client/css/lib/ui-grid/ui-grid.min.css b/src/vitis/client/css/lib/ui-grid/ui-grid.min.css
similarity index 100%
rename from vmap/client/css/lib/ui-grid/ui-grid.min.css
rename to src/vitis/client/css/lib/ui-grid/ui-grid.min.css
diff --git a/vmap/client/css/lib/ui-grid/ui-grid.svg b/src/vitis/client/css/lib/ui-grid/ui-grid.svg
similarity index 100%
rename from vmap/client/css/lib/ui-grid/ui-grid.svg
rename to src/vitis/client/css/lib/ui-grid/ui-grid.svg
diff --git a/vmap/client/css/lib/ui-grid/ui-grid.ttf b/src/vitis/client/css/lib/ui-grid/ui-grid.ttf
similarity index 100%
rename from vmap/client/css/lib/ui-grid/ui-grid.ttf
rename to src/vitis/client/css/lib/ui-grid/ui-grid.ttf
diff --git a/vmap/client/css/lib/ui-grid/ui-grid.woff b/src/vitis/client/css/lib/ui-grid/ui-grid.woff
similarity index 100%
rename from vmap/client/css/lib/ui-grid/ui-grid.woff
rename to src/vitis/client/css/lib/ui-grid/ui-grid.woff
diff --git a/vmap/client/css/lib/viewer/viewer.min.css b/src/vitis/client/css/lib/viewer/viewer.min.css
similarity index 100%
rename from vmap/client/css/lib/viewer/viewer.min.css
rename to src/vitis/client/css/lib/viewer/viewer.min.css
diff --git a/vmap/client/forms/forgotten_password.json b/src/vitis/client/forms/forgotten_password.json
similarity index 100%
rename from vmap/client/forms/forgotten_password.json
rename to src/vitis/client/forms/forgotten_password.json
diff --git a/vmap/client/forms/login.js b/src/vitis/client/forms/login.js
similarity index 100%
rename from vmap/client/forms/login.js
rename to src/vitis/client/forms/login.js
diff --git a/vmap/client/forms/login.json b/src/vitis/client/forms/login.json
similarity index 100%
rename from vmap/client/forms/login.json
rename to src/vitis/client/forms/login.json
diff --git a/vmap/client/forms/sign_up.json b/src/vitis/client/forms/sign_up.json
similarity index 100%
rename from vmap/client/forms/sign_up.json
rename to src/vitis/client/forms/sign_up.json
diff --git a/vmap/client/modules/vmap/images/ajax-big-loader.GIF b/src/vitis/client/images/ajax-big-loader.GIF
similarity index 100%
rename from vmap/client/modules/vmap/images/ajax-big-loader.GIF
rename to src/vitis/client/images/ajax-big-loader.GIF
diff --git a/vmap/client/modules/vmap/images/ajax-load-big.gif b/src/vitis/client/images/ajax-load-big.gif
similarity index 100%
rename from vmap/client/modules/vmap/images/ajax-load-big.gif
rename to src/vitis/client/images/ajax-load-big.gif
diff --git a/vmap/client/modules/vmap/images/ajax-load.gif b/src/vitis/client/images/ajax-load.gif
similarity index 100%
rename from vmap/client/modules/vmap/images/ajax-load.gif
rename to src/vitis/client/images/ajax-load.gif
diff --git a/vmap/client/images/bandeau.png b/src/vitis/client/images/bandeau.png
similarity index 100%
rename from vmap/client/images/bandeau.png
rename to src/vitis/client/images/bandeau.png
diff --git a/vmap/client/images/custom.png b/src/vitis/client/images/custom.png
similarity index 100%
rename from vmap/client/images/custom.png
rename to src/vitis/client/images/custom.png
diff --git a/vmap/client/images/disconnect_button.png b/src/vitis/client/images/disconnect_button.png
similarity index 100%
rename from vmap/client/images/disconnect_button.png
rename to src/vitis/client/images/disconnect_button.png
diff --git a/vmap/client/images/download.png b/src/vitis/client/images/download.png
similarity index 100%
rename from vmap/client/images/download.png
rename to src/vitis/client/images/download.png
diff --git a/vmap/client/images/editer.png b/src/vitis/client/images/editer.png
similarity index 100%
rename from vmap/client/images/editer.png
rename to src/vitis/client/images/editer.png
diff --git a/vmap/client/images/enveloppe.png b/src/vitis/client/images/enveloppe.png
similarity index 100%
rename from vmap/client/images/enveloppe.png
rename to src/vitis/client/images/enveloppe.png
diff --git a/vmap/client/images/false.png b/src/vitis/client/images/false.png
similarity index 100%
rename from vmap/client/images/false.png
rename to src/vitis/client/images/false.png
diff --git a/vmap/client/images/favicon.ico b/src/vitis/client/images/favicon.ico
similarity index 100%
rename from vmap/client/images/favicon.ico
rename to src/vitis/client/images/favicon.ico
diff --git a/vmap/client/images/i.png b/src/vitis/client/images/i.png
similarity index 100%
rename from vmap/client/images/i.png
rename to src/vitis/client/images/i.png
diff --git a/vmap/client/images/icons/geolocation_marker.png b/src/vitis/client/images/icons/geolocation_marker.png
similarity index 100%
rename from vmap/client/images/icons/geolocation_marker.png
rename to src/vitis/client/images/icons/geolocation_marker.png
diff --git a/vmap/client/images/icons/geolocation_marker_heading.png b/src/vitis/client/images/icons/geolocation_marker_heading.png
similarity index 100%
rename from vmap/client/images/icons/geolocation_marker_heading.png
rename to src/vitis/client/images/icons/geolocation_marker_heading.png
diff --git a/vmap/client/images/icons/icon-arrow-FME.png b/src/vitis/client/images/icons/icon-arrow-FME.png
similarity index 100%
rename from vmap/client/images/icons/icon-arrow-FME.png
rename to src/vitis/client/images/icons/icon-arrow-FME.png
diff --git a/vmap/client/images/icons/icon-arrow-FME2.png b/src/vitis/client/images/icons/icon-arrow-FME2.png
similarity index 100%
rename from vmap/client/images/icons/icon-arrow-FME2.png
rename to src/vitis/client/images/icons/icon-arrow-FME2.png
diff --git a/vmap/client/images/icons/icon-filtrage.png b/src/vitis/client/images/icons/icon-filtrage.png
similarity index 100%
rename from vmap/client/images/icons/icon-filtrage.png
rename to src/vitis/client/images/icons/icon-filtrage.png
diff --git a/vmap/client/images/icons/icons-down-search-arrow.png b/src/vitis/client/images/icons/icons-down-search-arrow.png
similarity index 100%
rename from vmap/client/images/icons/icons-down-search-arrow.png
rename to src/vitis/client/images/icons/icons-down-search-arrow.png
diff --git a/vmap/client/images/icons/icons-right-search-arrow.png b/src/vitis/client/images/icons/icons-right-search-arrow.png
similarity index 100%
rename from vmap/client/images/icons/icons-right-search-arrow.png
rename to src/vitis/client/images/icons/icons-right-search-arrow.png
diff --git a/vmap/client/modules/vmap/images/logo-veremes.jpg b/src/vitis/client/images/logo-veremes.jpg
similarity index 100%
rename from vmap/client/modules/vmap/images/logo-veremes.jpg
rename to src/vitis/client/images/logo-veremes.jpg
diff --git a/vmap/client/images/logo-veremes.png b/src/vitis/client/images/logo-veremes.png
similarity index 100%
rename from vmap/client/images/logo-veremes.png
rename to src/vitis/client/images/logo-veremes.png
diff --git a/vmap/client/images/mode/configuration.png b/src/vitis/client/images/mode/configuration.png
similarity index 100%
rename from vmap/client/images/mode/configuration.png
rename to src/vitis/client/images/mode/configuration.png
diff --git a/vmap/client/images/mode/development.png b/src/vitis/client/images/mode/development.png
similarity index 100%
rename from vmap/client/images/mode/development.png
rename to src/vitis/client/images/mode/development.png
diff --git a/vmap/client/images/mode/engine.png b/src/vitis/client/images/mode/engine.png
similarity index 100%
rename from vmap/client/images/mode/engine.png
rename to src/vitis/client/images/mode/engine.png
diff --git a/vmap/client/images/mode/help.png b/src/vitis/client/images/mode/help.png
similarity index 100%
rename from vmap/client/images/mode/help.png
rename to src/vitis/client/images/mode/help.png
diff --git a/vmap/client/images/mode/logs.png b/src/vitis/client/images/mode/logs.png
similarity index 100%
rename from vmap/client/images/mode/logs.png
rename to src/vitis/client/images/mode/logs.png
diff --git a/vmap/client/images/mode/my_work.png b/src/vitis/client/images/mode/my_work.png
similarity index 100%
rename from vmap/client/images/mode/my_work.png
rename to src/vitis/client/images/mode/my_work.png
diff --git a/vmap/client/images/mode/publication.png b/src/vitis/client/images/mode/publication.png
similarity index 100%
rename from vmap/client/images/mode/publication.png
rename to src/vitis/client/images/mode/publication.png
diff --git a/vmap/client/images/mode/statistics.png b/src/vitis/client/images/mode/statistics.png
similarity index 100%
rename from vmap/client/images/mode/statistics.png
rename to src/vitis/client/images/mode/statistics.png
diff --git a/vmap/client/images/mode/supervision.png b/src/vitis/client/images/mode/supervision.png
similarity index 100%
rename from vmap/client/images/mode/supervision.png
rename to src/vitis/client/images/mode/supervision.png
diff --git a/vmap/client/images/mode/user.png b/src/vitis/client/images/mode/user.png
similarity index 100%
rename from vmap/client/images/mode/user.png
rename to src/vitis/client/images/mode/user.png
diff --git a/vmap/client/images/mode/users.png b/src/vitis/client/images/mode/users.png
similarity index 100%
rename from vmap/client/images/mode/users.png
rename to src/vitis/client/images/mode/users.png
diff --git a/vmap/client/images/mode/vmap.png b/src/vitis/client/images/mode/vmap.png
similarity index 100%
rename from vmap/client/images/mode/vmap.png
rename to src/vitis/client/images/mode/vmap.png
diff --git a/vmap/client/images/page.png b/src/vitis/client/images/page.png
similarity index 100%
rename from vmap/client/images/page.png
rename to src/vitis/client/images/page.png
diff --git a/vmap/client/images/sql_list/st1.gif b/src/vitis/client/images/sql_list/st1.gif
similarity index 100%
rename from vmap/client/images/sql_list/st1.gif
rename to src/vitis/client/images/sql_list/st1.gif
diff --git a/vmap/client/images/sql_list/st1.png b/src/vitis/client/images/sql_list/st1.png
similarity index 100%
rename from vmap/client/images/sql_list/st1.png
rename to src/vitis/client/images/sql_list/st1.png
diff --git a/vmap/client/images/sql_list/st2.png b/src/vitis/client/images/sql_list/st2.png
similarity index 100%
rename from vmap/client/images/sql_list/st2.png
rename to src/vitis/client/images/sql_list/st2.png
diff --git a/vmap/client/images/sql_list/st3.png b/src/vitis/client/images/sql_list/st3.png
similarity index 100%
rename from vmap/client/images/sql_list/st3.png
rename to src/vitis/client/images/sql_list/st3.png
diff --git a/vmap/client/images/sql_list/st4.png b/src/vitis/client/images/sql_list/st4.png
similarity index 100%
rename from vmap/client/images/sql_list/st4.png
rename to src/vitis/client/images/sql_list/st4.png
diff --git a/vmap/client/images/sql_list/st5.gif b/src/vitis/client/images/sql_list/st5.gif
similarity index 100%
rename from vmap/client/images/sql_list/st5.gif
rename to src/vitis/client/images/sql_list/st5.gif
diff --git a/vmap/client/images/sql_list/st6.png b/src/vitis/client/images/sql_list/st6.png
similarity index 100%
rename from vmap/client/images/sql_list/st6.png
rename to src/vitis/client/images/sql_list/st6.png
diff --git a/vmap/client/images/true.png b/src/vitis/client/images/true.png
similarity index 100%
rename from vmap/client/images/true.png
rename to src/vitis/client/images/true.png
diff --git a/vmap/client/images/ui-grid/wbg.gif b/src/vitis/client/images/ui-grid/wbg.gif
similarity index 100%
rename from vmap/client/images/ui-grid/wbg.gif
rename to src/vitis/client/images/ui-grid/wbg.gif
diff --git a/vmap/client/images/visualiser.png b/src/vitis/client/images/visualiser.png
similarity index 100%
rename from vmap/client/images/visualiser.png
rename to src/vitis/client/images/visualiser.png
diff --git a/vmap/client/images/wk_params.png b/src/vitis/client/images/wk_params.png
similarity index 100%
rename from vmap/client/images/wk_params.png
rename to src/vitis/client/images/wk_params.png
diff --git a/vmap/client/index.html b/src/vitis/client/index.html
similarity index 97%
rename from vmap/client/index.html
rename to src/vitis/client/index.html
index e7c405f05b308fb7b317fef764e4f78dbd0dd41a..c773f9a3c6b2ba3f9d53814629825871fe501ad6 100755
--- a/vmap/client/index.html
+++ b/src/vitis/client/index.html
@@ -4,7 +4,7 @@
         <meta charset="UTF-8">
         <meta http-equiv="X-UA-Compatible" content="IE=edge" />
         <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
-        <title>Administration</title>
+        <title>Vitis 2018</title>
         <script src="javascript/externs/jquery/jquery-1.11.3.min.js"></script>
         <script src="javascript/externs/mobile-detect/mobile-detect.min.js"></script>
         <script src="https://www.google.com/recaptcha/api.js" async defer></script>
@@ -171,4 +171,4 @@
             });
         </script>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/vmap/client/javascript/app/app.js b/src/vitis/client/javascript/app/app.js
similarity index 100%
rename from vmap/client/javascript/app/app.js
rename to src/vitis/client/javascript/app/app.js
diff --git a/vmap/client/javascript/app/config.js b/src/vitis/client/javascript/app/config.js
similarity index 100%
rename from vmap/client/javascript/app/config.js
rename to src/vitis/client/javascript/app/config.js
diff --git a/vmap/client/javascript/app/controllers/doubleFormCtrl.js b/src/vitis/client/javascript/app/controllers/doubleFormCtrl.js
similarity index 100%
rename from vmap/client/javascript/app/controllers/doubleFormCtrl.js
rename to src/vitis/client/javascript/app/controllers/doubleFormCtrl.js
diff --git a/vmap/client/javascript/app/controllers/htmlFormCtrl.js b/src/vitis/client/javascript/app/controllers/htmlFormCtrl.js
old mode 100644
new mode 100755
similarity index 94%
rename from vmap/client/javascript/app/controllers/htmlFormCtrl.js
rename to src/vitis/client/javascript/app/controllers/htmlFormCtrl.js
index 8dc2c9ddb674e5b11da2e2802238d49698c30f58..f5d57ca8bb0ebe1b531ae36192adae92b89896c8
--- a/vmap/client/javascript/app/controllers/htmlFormCtrl.js
+++ b/src/vitis/client/javascript/app/controllers/htmlFormCtrl.js
@@ -111,9 +111,15 @@ vitisApp.htmlFormCtrl = function ($scope, $log, $q, $timeout, envSrvc, propertie
         else {
             var sModuleName = envSrvc["oSelectedMode"]["module_name"];
             if(goog.isDefAndNotNull(envSrvc["oSectionForm"][sTable])){
-                var sModuleName2 = envSrvc["oSectionForm"][sTable]["sections"][envSrvc["oSectionForm"][sTable]["iSelectedSectionIndex"]]["module_name"];
-                if (goog.isDefAndNotNull(sModuleName2)) {
-                    sModuleName = sModuleName2;
+                if(goog.isDefAndNotNull(envSrvc["oSectionForm"][sTable]["sections"])){
+                    if(goog.isDefAndNotNull(envSrvc["oSectionForm"][sTable]["iSelectedSectionIndex"])){
+                        if(goog.isDefAndNotNull(envSrvc["oSectionForm"][sTable]["sections"][envSrvc["oSectionForm"][sTable]["iSelectedSectionIndex"]])){
+                            var sModuleName2 = envSrvc["oSectionForm"][sTable]["sections"][envSrvc["oSectionForm"][sTable]["iSelectedSectionIndex"]]["module_name"];
+                            if (goog.isDefAndNotNull(sModuleName2)) {
+                                sModuleName = sModuleName2;
+                            }
+                        }
+                    }
                 }
             }
             oFormRequestParams["sUrl"] = "modules/" + sModuleName + "/forms/" + envSrvc["oSelectedMode"]["mode_id"] + "/" + sTable;
diff --git a/vmap/client/javascript/app/controllers/initCtrl.js b/src/vitis/client/javascript/app/controllers/initCtrl.js
similarity index 100%
rename from vmap/client/javascript/app/controllers/initCtrl.js
rename to src/vitis/client/javascript/app/controllers/initCtrl.js
diff --git a/vmap/client/javascript/app/controllers/loginCtrl.js b/src/vitis/client/javascript/app/controllers/loginCtrl.js
old mode 100755
new mode 100644
similarity index 97%
rename from vmap/client/javascript/app/controllers/loginCtrl.js
rename to src/vitis/client/javascript/app/controllers/loginCtrl.js
index 1b94432d07b42f11c40e10ffc2af446a14673505..4e6e14618cdf92462865f9f573dbee866c13f221
--- a/vmap/client/javascript/app/controllers/loginCtrl.js
+++ b/src/vitis/client/javascript/app/controllers/loginCtrl.js
@@ -432,17 +432,23 @@ vitisApp.loginCtrl = function ($scope, $translate, $rootScope, $q, sessionSrvc,
                                 $translate([sConnectionErrorMessage]).then(function (translations) {
                                     sConnectionErrorMessage = translations[sConnectionErrorMessage];
                                     $scope["showErrorAlert"](sConnectionErrorMessage.replace('[IPAddress]', ipAddress));
-                        deferred.reject();
+                                    sConnectionErrorMessage = undefined;
+                                    deferred.reject();
                                 });
-
+                                break;
+                            // Pas de privilège "vitis_user".
+                            case 18:
+                                sConnectionErrorMessage = "FORM_LOGIN_CONNECTION_ERROR_MISSING_PRIVILEGES";
                                 break;
                             default:
                                 sConnectionErrorMessage = "FORM_LOGIN_CONNECTION_ERROR";
-                                $scope["showErrorAlert"](sConnectionErrorMessage);
-                                deferred.reject();
+                        }
+                        if (typeof(sConnectionErrorMessage) != "undefined") {
+                            $scope["showErrorAlert"](sConnectionErrorMessage);
+                            deferred.reject();
+                        }
                     }
                 }
-                }
             });
         }
 
diff --git a/vmap/client/javascript/app/controllers/mainCtrl.js b/src/vitis/client/javascript/app/controllers/mainCtrl.js
similarity index 100%
rename from vmap/client/javascript/app/controllers/mainCtrl.js
rename to src/vitis/client/javascript/app/controllers/mainCtrl.js
diff --git a/vmap/client/javascript/app/controllers/sectionFormCtrl.js b/src/vitis/client/javascript/app/controllers/sectionFormCtrl.js
old mode 100644
new mode 100755
similarity index 100%
rename from vmap/client/javascript/app/controllers/sectionFormCtrl.js
rename to src/vitis/client/javascript/app/controllers/sectionFormCtrl.js
diff --git a/vmap/client/javascript/app/controllers/simpleFormCtrl.js b/src/vitis/client/javascript/app/controllers/simpleFormCtrl.js
similarity index 100%
rename from vmap/client/javascript/app/controllers/simpleFormCtrl.js
rename to src/vitis/client/javascript/app/controllers/simpleFormCtrl.js
diff --git a/vmap/client/javascript/app/controllers/workspaceListCtrl.js b/src/vitis/client/javascript/app/controllers/workspaceListCtrl.js
similarity index 100%
rename from vmap/client/javascript/app/controllers/workspaceListCtrl.js
rename to src/vitis/client/javascript/app/controllers/workspaceListCtrl.js
diff --git a/vmap/client/javascript/app/directives/doubleFormDrtv.js b/src/vitis/client/javascript/app/directives/doubleFormDrtv.js
similarity index 100%
rename from vmap/client/javascript/app/directives/doubleFormDrtv.js
rename to src/vitis/client/javascript/app/directives/doubleFormDrtv.js
diff --git a/vmap/client/javascript/app/directives/htmlFormDrtv.js b/src/vitis/client/javascript/app/directives/htmlFormDrtv.js
similarity index 100%
rename from vmap/client/javascript/app/directives/htmlFormDrtv.js
rename to src/vitis/client/javascript/app/directives/htmlFormDrtv.js
diff --git a/vmap/client/javascript/app/directives/initDrtv.js b/src/vitis/client/javascript/app/directives/initDrtv.js
similarity index 100%
rename from vmap/client/javascript/app/directives/initDrtv.js
rename to src/vitis/client/javascript/app/directives/initDrtv.js
diff --git a/vmap/client/javascript/app/directives/loginDrtv.js b/src/vitis/client/javascript/app/directives/loginDrtv.js
similarity index 100%
rename from vmap/client/javascript/app/directives/loginDrtv.js
rename to src/vitis/client/javascript/app/directives/loginDrtv.js
diff --git a/vmap/client/javascript/app/directives/mainDrtv.js b/src/vitis/client/javascript/app/directives/mainDrtv.js
similarity index 100%
rename from vmap/client/javascript/app/directives/mainDrtv.js
rename to src/vitis/client/javascript/app/directives/mainDrtv.js
diff --git a/vmap/client/javascript/app/directives/sectionFormDrtv.js b/src/vitis/client/javascript/app/directives/sectionFormDrtv.js
similarity index 100%
rename from vmap/client/javascript/app/directives/sectionFormDrtv.js
rename to src/vitis/client/javascript/app/directives/sectionFormDrtv.js
diff --git a/vmap/client/javascript/app/directives/simpleFormDrtv.js b/src/vitis/client/javascript/app/directives/simpleFormDrtv.js
similarity index 100%
rename from vmap/client/javascript/app/directives/simpleFormDrtv.js
rename to src/vitis/client/javascript/app/directives/simpleFormDrtv.js
diff --git a/vmap/client/javascript/app/directives/workspaceListDrtv.js b/src/vitis/client/javascript/app/directives/workspaceListDrtv.js
similarity index 100%
rename from vmap/client/javascript/app/directives/workspaceListDrtv.js
rename to src/vitis/client/javascript/app/directives/workspaceListDrtv.js
diff --git a/vmap/client/javascript/app/loadApp.js b/src/vitis/client/javascript/app/loadApp.js
similarity index 100%
rename from vmap/client/javascript/app/loadApp.js
rename to src/vitis/client/javascript/app/loadApp.js
diff --git a/vmap/client/javascript/app/loadExternalFiles.js b/src/vitis/client/javascript/app/loadExternalFiles.js
old mode 100644
new mode 100755
similarity index 100%
rename from vmap/client/javascript/app/loadExternalFiles.js
rename to src/vitis/client/javascript/app/loadExternalFiles.js
diff --git a/vmap/client/javascript/app/modules/mainMod.js b/src/vitis/client/javascript/app/modules/mainMod.js
old mode 100644
new mode 100755
similarity index 100%
rename from vmap/client/javascript/app/modules/mainMod.js
rename to src/vitis/client/javascript/app/modules/mainMod.js
diff --git a/vmap/client/javascript/app/script_client.js b/src/vitis/client/javascript/app/script_client.js
similarity index 100%
rename from vmap/client/javascript/app/script_client.js
rename to src/vitis/client/javascript/app/script_client.js
diff --git a/vmap/client/javascript/app/services/formSrvc.js b/src/vitis/client/javascript/app/services/formSrvc.js
similarity index 100%
rename from vmap/client/javascript/app/services/formSrvc.js
rename to src/vitis/client/javascript/app/services/formSrvc.js
diff --git a/vmap/client/javascript/app/services/mainSrvc.js b/src/vitis/client/javascript/app/services/mainSrvc.js
similarity index 100%
rename from vmap/client/javascript/app/services/mainSrvc.js
rename to src/vitis/client/javascript/app/services/mainSrvc.js
diff --git a/vmap/client/javascript/app/vitiswebsocket.js b/src/vitis/client/javascript/app/vitiswebsocket.js
similarity index 100%
rename from vmap/client/javascript/app/vitiswebsocket.js
rename to src/vitis/client/javascript/app/vitiswebsocket.js
diff --git a/vmap/client/javascript/externs/LICENSE b/src/vitis/client/javascript/externs/LICENSE
similarity index 100%
rename from vmap/client/javascript/externs/LICENSE
rename to src/vitis/client/javascript/externs/LICENSE
diff --git a/vmap/client/javascript/externs/alasql/alasql.min.js b/src/vitis/client/javascript/externs/alasql/alasql.min.js
similarity index 100%
rename from vmap/client/javascript/externs/alasql/alasql.min.js
rename to src/vitis/client/javascript/externs/alasql/alasql.min.js
diff --git a/vmap/client/javascript/externs/alasql/xlsx.core.min.js b/src/vitis/client/javascript/externs/alasql/xlsx.core.min.js
similarity index 100%
rename from vmap/client/javascript/externs/alasql/xlsx.core.min.js
rename to src/vitis/client/javascript/externs/alasql/xlsx.core.min.js
diff --git a/vmap/client/javascript/externs/angular-bind-notifier/LICENSE b/src/vitis/client/javascript/externs/angular-bind-notifier/LICENSE
similarity index 100%
rename from vmap/client/javascript/externs/angular-bind-notifier/LICENSE
rename to src/vitis/client/javascript/externs/angular-bind-notifier/LICENSE
diff --git a/vmap/client/javascript/externs/angular-bind-notifier/bindNotifier.js b/src/vitis/client/javascript/externs/angular-bind-notifier/bindNotifier.js
similarity index 100%
rename from vmap/client/javascript/externs/angular-bind-notifier/bindNotifier.js
rename to src/vitis/client/javascript/externs/angular-bind-notifier/bindNotifier.js
diff --git a/vmap/client/javascript/externs/angular-ui-codemirror/LICENSE b/src/vitis/client/javascript/externs/angular-ui-codemirror/LICENSE
similarity index 100%
rename from vmap/client/javascript/externs/angular-ui-codemirror/LICENSE
rename to src/vitis/client/javascript/externs/angular-ui-codemirror/LICENSE
diff --git a/vmap/client/javascript/externs/angular-ui-codemirror/ui-codemirror.js b/src/vitis/client/javascript/externs/angular-ui-codemirror/ui-codemirror.js
similarity index 100%
rename from vmap/client/javascript/externs/angular-ui-codemirror/ui-codemirror.js
rename to src/vitis/client/javascript/externs/angular-ui-codemirror/ui-codemirror.js
diff --git a/vmap/client/javascript/externs/angular-ui-codemirror/ui-codemirror.min.js b/src/vitis/client/javascript/externs/angular-ui-codemirror/ui-codemirror.min.js
similarity index 100%
rename from vmap/client/javascript/externs/angular-ui-codemirror/ui-codemirror.min.js
rename to src/vitis/client/javascript/externs/angular-ui-codemirror/ui-codemirror.min.js
diff --git a/vmap/client/javascript/externs/angular/LICENSE b/src/vitis/client/javascript/externs/angular/LICENSE
similarity index 100%
rename from vmap/client/javascript/externs/angular/LICENSE
rename to src/vitis/client/javascript/externs/angular/LICENSE
diff --git a/vmap/client/javascript/externs/angular/angular.js b/src/vitis/client/javascript/externs/angular/angular.js
similarity index 100%
rename from vmap/client/javascript/externs/angular/angular.js
rename to src/vitis/client/javascript/externs/angular/angular.js
diff --git a/vmap/client/javascript/externs/angular/angular.min.js b/src/vitis/client/javascript/externs/angular/angular.min.js
similarity index 100%
rename from vmap/client/javascript/externs/angular/angular.min.js
rename to src/vitis/client/javascript/externs/angular/angular.min.js
diff --git a/vmap/client/javascript/externs/angular/angular.min.js.map b/src/vitis/client/javascript/externs/angular/angular.min.js.map
similarity index 100%
rename from vmap/client/javascript/externs/angular/angular.min.js.map
rename to src/vitis/client/javascript/externs/angular/angular.min.js.map
diff --git a/vmap/client/javascript/externs/angular/modules/angular-translate/LICENSE b/src/vitis/client/javascript/externs/angular/modules/angular-translate/LICENSE
similarity index 100%
rename from vmap/client/javascript/externs/angular/modules/angular-translate/LICENSE
rename to src/vitis/client/javascript/externs/angular/modules/angular-translate/LICENSE
diff --git a/vmap/client/javascript/externs/angular/modules/angular-translate/angular-translate-loader-partial.js b/src/vitis/client/javascript/externs/angular/modules/angular-translate/angular-translate-loader-partial.js
similarity index 100%
rename from vmap/client/javascript/externs/angular/modules/angular-translate/angular-translate-loader-partial.js
rename to src/vitis/client/javascript/externs/angular/modules/angular-translate/angular-translate-loader-partial.js
diff --git a/vmap/client/javascript/externs/angular/modules/angular-translate/angular-translate-loader-partial.min.js b/src/vitis/client/javascript/externs/angular/modules/angular-translate/angular-translate-loader-partial.min.js
similarity index 100%
rename from vmap/client/javascript/externs/angular/modules/angular-translate/angular-translate-loader-partial.min.js
rename to src/vitis/client/javascript/externs/angular/modules/angular-translate/angular-translate-loader-partial.min.js
diff --git a/vmap/client/javascript/externs/angular/modules/angular-translate/angular-translate-loader-static-files.js b/src/vitis/client/javascript/externs/angular/modules/angular-translate/angular-translate-loader-static-files.js
similarity index 100%
rename from vmap/client/javascript/externs/angular/modules/angular-translate/angular-translate-loader-static-files.js
rename to src/vitis/client/javascript/externs/angular/modules/angular-translate/angular-translate-loader-static-files.js
diff --git a/vmap/client/javascript/externs/angular/modules/angular-translate/angular-translate-loader-static-files.min.js b/src/vitis/client/javascript/externs/angular/modules/angular-translate/angular-translate-loader-static-files.min.js
similarity index 100%
rename from vmap/client/javascript/externs/angular/modules/angular-translate/angular-translate-loader-static-files.min.js
rename to src/vitis/client/javascript/externs/angular/modules/angular-translate/angular-translate-loader-static-files.min.js
diff --git a/vmap/client/javascript/externs/angular/modules/angular-translate/angular-translate.js b/src/vitis/client/javascript/externs/angular/modules/angular-translate/angular-translate.js
similarity index 100%
rename from vmap/client/javascript/externs/angular/modules/angular-translate/angular-translate.js
rename to src/vitis/client/javascript/externs/angular/modules/angular-translate/angular-translate.js
diff --git a/vmap/client/javascript/externs/angular/modules/angular-translate/angular-translate.min.js b/src/vitis/client/javascript/externs/angular/modules/angular-translate/angular-translate.min.js
similarity index 100%
rename from vmap/client/javascript/externs/angular/modules/angular-translate/angular-translate.min.js
rename to src/vitis/client/javascript/externs/angular/modules/angular-translate/angular-translate.min.js
diff --git a/vmap/client/javascript/externs/angular/modules/sanitize/angular-sanitize.js b/src/vitis/client/javascript/externs/angular/modules/sanitize/angular-sanitize.js
similarity index 100%
rename from vmap/client/javascript/externs/angular/modules/sanitize/angular-sanitize.js
rename to src/vitis/client/javascript/externs/angular/modules/sanitize/angular-sanitize.js
diff --git a/vmap/client/javascript/externs/angular/modules/sanitize/angular-sanitize.min.js b/src/vitis/client/javascript/externs/angular/modules/sanitize/angular-sanitize.min.js
similarity index 100%
rename from vmap/client/javascript/externs/angular/modules/sanitize/angular-sanitize.min.js
rename to src/vitis/client/javascript/externs/angular/modules/sanitize/angular-sanitize.min.js
diff --git a/vmap/client/javascript/externs/angular/modules/sanitize/angular-sanitize.min.js.map b/src/vitis/client/javascript/externs/angular/modules/sanitize/angular-sanitize.min.js.map
similarity index 100%
rename from vmap/client/javascript/externs/angular/modules/sanitize/angular-sanitize.min.js.map
rename to src/vitis/client/javascript/externs/angular/modules/sanitize/angular-sanitize.min.js.map
diff --git a/vmap/client/javascript/externs/angular/modules/ui-codemirror/LICENSE b/src/vitis/client/javascript/externs/angular/modules/ui-codemirror/LICENSE
similarity index 100%
rename from vmap/client/javascript/externs/angular/modules/ui-codemirror/LICENSE
rename to src/vitis/client/javascript/externs/angular/modules/ui-codemirror/LICENSE
diff --git a/vmap/client/javascript/externs/angular/modules/ui-codemirror/ui-codemirror.min.js b/src/vitis/client/javascript/externs/angular/modules/ui-codemirror/ui-codemirror.min.js
similarity index 100%
rename from vmap/client/javascript/externs/angular/modules/ui-codemirror/ui-codemirror.min.js
rename to src/vitis/client/javascript/externs/angular/modules/ui-codemirror/ui-codemirror.min.js
diff --git a/vmap/client/javascript/externs/angular/modules/ui-grid/LICENSE.md b/src/vitis/client/javascript/externs/angular/modules/ui-grid/LICENSE.md
similarity index 100%
rename from vmap/client/javascript/externs/angular/modules/ui-grid/LICENSE.md
rename to src/vitis/client/javascript/externs/angular/modules/ui-grid/LICENSE.md
diff --git a/vmap/client/javascript/externs/angular/modules/ui-grid/plugins/draggable-rows.js b/src/vitis/client/javascript/externs/angular/modules/ui-grid/plugins/draggable-rows.js
similarity index 100%
rename from vmap/client/javascript/externs/angular/modules/ui-grid/plugins/draggable-rows.js
rename to src/vitis/client/javascript/externs/angular/modules/ui-grid/plugins/draggable-rows.js
diff --git a/vmap/client/javascript/externs/angular/modules/ui-grid/ui-grid.js b/src/vitis/client/javascript/externs/angular/modules/ui-grid/ui-grid.js
similarity index 100%
rename from vmap/client/javascript/externs/angular/modules/ui-grid/ui-grid.js
rename to src/vitis/client/javascript/externs/angular/modules/ui-grid/ui-grid.js
diff --git a/vmap/client/javascript/externs/angular/modules/ui-grid/ui-grid.min.js b/src/vitis/client/javascript/externs/angular/modules/ui-grid/ui-grid.min.js
similarity index 100%
rename from vmap/client/javascript/externs/angular/modules/ui-grid/ui-grid.min.js
rename to src/vitis/client/javascript/externs/angular/modules/ui-grid/ui-grid.min.js
diff --git a/vmap/client/javascript/externs/angular/modules/ui-tinymce/LICENSE b/src/vitis/client/javascript/externs/angular/modules/ui-tinymce/LICENSE
similarity index 100%
rename from vmap/client/javascript/externs/angular/modules/ui-tinymce/LICENSE
rename to src/vitis/client/javascript/externs/angular/modules/ui-tinymce/LICENSE
diff --git a/vmap/client/javascript/externs/angular/modules/ui-tinymce/tinymce.js b/src/vitis/client/javascript/externs/angular/modules/ui-tinymce/tinymce.js
similarity index 100%
rename from vmap/client/javascript/externs/angular/modules/ui-tinymce/tinymce.js
rename to src/vitis/client/javascript/externs/angular/modules/ui-tinymce/tinymce.js
diff --git a/vmap/client/javascript/externs/bootbox/LICENSE.md b/src/vitis/client/javascript/externs/bootbox/LICENSE.md
similarity index 100%
rename from vmap/client/javascript/externs/bootbox/LICENSE.md
rename to src/vitis/client/javascript/externs/bootbox/LICENSE.md
diff --git a/vmap/client/javascript/externs/bootbox/bootbox.min.js b/src/vitis/client/javascript/externs/bootbox/bootbox.min.js
similarity index 100%
rename from vmap/client/javascript/externs/bootbox/bootbox.min.js
rename to src/vitis/client/javascript/externs/bootbox/bootbox.min.js
diff --git a/vmap/client/javascript/externs/bootstrap/LICENSE b/src/vitis/client/javascript/externs/bootstrap/LICENSE
similarity index 100%
rename from vmap/client/javascript/externs/bootstrap/LICENSE
rename to src/vitis/client/javascript/externs/bootstrap/LICENSE
diff --git a/vmap/client/javascript/externs/bootstrap/bootstrap.js b/src/vitis/client/javascript/externs/bootstrap/bootstrap.js
similarity index 100%
rename from vmap/client/javascript/externs/bootstrap/bootstrap.js
rename to src/vitis/client/javascript/externs/bootstrap/bootstrap.js
diff --git a/vmap/client/javascript/externs/bootstrap/bootstrap.min.js b/src/vitis/client/javascript/externs/bootstrap/bootstrap.min.js
similarity index 100%
rename from vmap/client/javascript/externs/bootstrap/bootstrap.min.js
rename to src/vitis/client/javascript/externs/bootstrap/bootstrap.min.js
diff --git a/vmap/client/javascript/externs/codemirror/LICENSE b/src/vitis/client/javascript/externs/codemirror/LICENSE
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/LICENSE
rename to src/vitis/client/javascript/externs/codemirror/LICENSE
diff --git a/vmap/client/javascript/externs/codemirror/addon/comment/comment.js b/src/vitis/client/javascript/externs/codemirror/addon/comment/comment.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/comment/comment.js
rename to src/vitis/client/javascript/externs/codemirror/addon/comment/comment.js
diff --git a/vmap/client/javascript/externs/codemirror/addon/comment/continuecomment.js b/src/vitis/client/javascript/externs/codemirror/addon/comment/continuecomment.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/comment/continuecomment.js
rename to src/vitis/client/javascript/externs/codemirror/addon/comment/continuecomment.js
diff --git a/vmap/client/javascript/externs/codemirror/addon/dialog/dialog.css b/src/vitis/client/javascript/externs/codemirror/addon/dialog/dialog.css
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/dialog/dialog.css
rename to src/vitis/client/javascript/externs/codemirror/addon/dialog/dialog.css
diff --git a/vmap/client/javascript/externs/codemirror/addon/dialog/dialog.js b/src/vitis/client/javascript/externs/codemirror/addon/dialog/dialog.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/dialog/dialog.js
rename to src/vitis/client/javascript/externs/codemirror/addon/dialog/dialog.js
diff --git a/vmap/client/javascript/externs/codemirror/addon/display/autorefresh.js b/src/vitis/client/javascript/externs/codemirror/addon/display/autorefresh.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/display/autorefresh.js
rename to src/vitis/client/javascript/externs/codemirror/addon/display/autorefresh.js
diff --git a/vmap/client/javascript/externs/codemirror/addon/display/fullscreen.css b/src/vitis/client/javascript/externs/codemirror/addon/display/fullscreen.css
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/display/fullscreen.css
rename to src/vitis/client/javascript/externs/codemirror/addon/display/fullscreen.css
diff --git a/vmap/client/javascript/externs/codemirror/addon/display/fullscreen.js b/src/vitis/client/javascript/externs/codemirror/addon/display/fullscreen.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/display/fullscreen.js
rename to src/vitis/client/javascript/externs/codemirror/addon/display/fullscreen.js
diff --git a/vmap/client/javascript/externs/codemirror/addon/display/panel.js b/src/vitis/client/javascript/externs/codemirror/addon/display/panel.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/display/panel.js
rename to src/vitis/client/javascript/externs/codemirror/addon/display/panel.js
diff --git a/vmap/client/javascript/externs/codemirror/addon/display/placeholder.js b/src/vitis/client/javascript/externs/codemirror/addon/display/placeholder.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/display/placeholder.js
rename to src/vitis/client/javascript/externs/codemirror/addon/display/placeholder.js
diff --git a/vmap/client/javascript/externs/codemirror/addon/display/rulers.js b/src/vitis/client/javascript/externs/codemirror/addon/display/rulers.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/display/rulers.js
rename to src/vitis/client/javascript/externs/codemirror/addon/display/rulers.js
diff --git a/vmap/client/javascript/externs/codemirror/addon/edit/closebrackets.js b/src/vitis/client/javascript/externs/codemirror/addon/edit/closebrackets.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/edit/closebrackets.js
rename to src/vitis/client/javascript/externs/codemirror/addon/edit/closebrackets.js
diff --git a/vmap/client/javascript/externs/codemirror/addon/edit/closetag.js b/src/vitis/client/javascript/externs/codemirror/addon/edit/closetag.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/edit/closetag.js
rename to src/vitis/client/javascript/externs/codemirror/addon/edit/closetag.js
diff --git a/vmap/client/javascript/externs/codemirror/addon/edit/continuelist.js b/src/vitis/client/javascript/externs/codemirror/addon/edit/continuelist.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/edit/continuelist.js
rename to src/vitis/client/javascript/externs/codemirror/addon/edit/continuelist.js
diff --git a/vmap/client/javascript/externs/codemirror/addon/edit/matchbrackets.js b/src/vitis/client/javascript/externs/codemirror/addon/edit/matchbrackets.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/edit/matchbrackets.js
rename to src/vitis/client/javascript/externs/codemirror/addon/edit/matchbrackets.js
diff --git a/vmap/client/javascript/externs/codemirror/addon/edit/matchtags.js b/src/vitis/client/javascript/externs/codemirror/addon/edit/matchtags.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/edit/matchtags.js
rename to src/vitis/client/javascript/externs/codemirror/addon/edit/matchtags.js
diff --git a/vmap/client/javascript/externs/codemirror/addon/edit/trailingspace.js b/src/vitis/client/javascript/externs/codemirror/addon/edit/trailingspace.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/edit/trailingspace.js
rename to src/vitis/client/javascript/externs/codemirror/addon/edit/trailingspace.js
diff --git a/vmap/client/javascript/externs/codemirror/addon/fold/brace-fold.js b/src/vitis/client/javascript/externs/codemirror/addon/fold/brace-fold.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/fold/brace-fold.js
rename to src/vitis/client/javascript/externs/codemirror/addon/fold/brace-fold.js
diff --git a/vmap/client/javascript/externs/codemirror/addon/fold/comment-fold.js b/src/vitis/client/javascript/externs/codemirror/addon/fold/comment-fold.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/fold/comment-fold.js
rename to src/vitis/client/javascript/externs/codemirror/addon/fold/comment-fold.js
diff --git a/vmap/client/javascript/externs/codemirror/addon/fold/foldcode.js b/src/vitis/client/javascript/externs/codemirror/addon/fold/foldcode.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/fold/foldcode.js
rename to src/vitis/client/javascript/externs/codemirror/addon/fold/foldcode.js
diff --git a/vmap/client/javascript/externs/codemirror/addon/fold/foldgutter.css b/src/vitis/client/javascript/externs/codemirror/addon/fold/foldgutter.css
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/fold/foldgutter.css
rename to src/vitis/client/javascript/externs/codemirror/addon/fold/foldgutter.css
diff --git a/vmap/client/javascript/externs/codemirror/addon/fold/foldgutter.js b/src/vitis/client/javascript/externs/codemirror/addon/fold/foldgutter.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/fold/foldgutter.js
rename to src/vitis/client/javascript/externs/codemirror/addon/fold/foldgutter.js
diff --git a/vmap/client/javascript/externs/codemirror/addon/fold/indent-fold.js b/src/vitis/client/javascript/externs/codemirror/addon/fold/indent-fold.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/fold/indent-fold.js
rename to src/vitis/client/javascript/externs/codemirror/addon/fold/indent-fold.js
diff --git a/vmap/client/javascript/externs/codemirror/addon/fold/markdown-fold.js b/src/vitis/client/javascript/externs/codemirror/addon/fold/markdown-fold.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/fold/markdown-fold.js
rename to src/vitis/client/javascript/externs/codemirror/addon/fold/markdown-fold.js
diff --git a/vmap/client/javascript/externs/codemirror/addon/fold/xml-fold.js b/src/vitis/client/javascript/externs/codemirror/addon/fold/xml-fold.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/fold/xml-fold.js
rename to src/vitis/client/javascript/externs/codemirror/addon/fold/xml-fold.js
diff --git a/vmap/client/javascript/externs/codemirror/addon/hint/anyword-hint.js b/src/vitis/client/javascript/externs/codemirror/addon/hint/anyword-hint.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/hint/anyword-hint.js
rename to src/vitis/client/javascript/externs/codemirror/addon/hint/anyword-hint.js
diff --git a/vmap/client/javascript/externs/codemirror/addon/hint/css-hint.js b/src/vitis/client/javascript/externs/codemirror/addon/hint/css-hint.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/hint/css-hint.js
rename to src/vitis/client/javascript/externs/codemirror/addon/hint/css-hint.js
diff --git a/vmap/client/javascript/externs/codemirror/addon/hint/html-hint.js b/src/vitis/client/javascript/externs/codemirror/addon/hint/html-hint.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/hint/html-hint.js
rename to src/vitis/client/javascript/externs/codemirror/addon/hint/html-hint.js
diff --git a/vmap/client/javascript/externs/codemirror/addon/hint/javascript-hint.js b/src/vitis/client/javascript/externs/codemirror/addon/hint/javascript-hint.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/hint/javascript-hint.js
rename to src/vitis/client/javascript/externs/codemirror/addon/hint/javascript-hint.js
diff --git a/vmap/client/javascript/externs/codemirror/addon/hint/show-hint.css b/src/vitis/client/javascript/externs/codemirror/addon/hint/show-hint.css
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/hint/show-hint.css
rename to src/vitis/client/javascript/externs/codemirror/addon/hint/show-hint.css
diff --git a/vmap/client/javascript/externs/codemirror/addon/hint/show-hint.js b/src/vitis/client/javascript/externs/codemirror/addon/hint/show-hint.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/hint/show-hint.js
rename to src/vitis/client/javascript/externs/codemirror/addon/hint/show-hint.js
diff --git a/vmap/client/javascript/externs/codemirror/addon/hint/sql-hint.js b/src/vitis/client/javascript/externs/codemirror/addon/hint/sql-hint.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/hint/sql-hint.js
rename to src/vitis/client/javascript/externs/codemirror/addon/hint/sql-hint.js
diff --git a/vmap/client/javascript/externs/codemirror/addon/hint/xml-hint.js b/src/vitis/client/javascript/externs/codemirror/addon/hint/xml-hint.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/hint/xml-hint.js
rename to src/vitis/client/javascript/externs/codemirror/addon/hint/xml-hint.js
diff --git a/vmap/client/javascript/externs/codemirror/addon/keymap/sublime.js b/src/vitis/client/javascript/externs/codemirror/addon/keymap/sublime.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/keymap/sublime.js
rename to src/vitis/client/javascript/externs/codemirror/addon/keymap/sublime.js
diff --git a/vmap/client/javascript/externs/codemirror/addon/lint/coffeescript-lint.js b/src/vitis/client/javascript/externs/codemirror/addon/lint/coffeescript-lint.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/lint/coffeescript-lint.js
rename to src/vitis/client/javascript/externs/codemirror/addon/lint/coffeescript-lint.js
diff --git a/vmap/client/javascript/externs/codemirror/addon/lint/css-lint.js b/src/vitis/client/javascript/externs/codemirror/addon/lint/css-lint.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/lint/css-lint.js
rename to src/vitis/client/javascript/externs/codemirror/addon/lint/css-lint.js
diff --git a/vmap/client/javascript/externs/codemirror/addon/lint/html-lint.js b/src/vitis/client/javascript/externs/codemirror/addon/lint/html-lint.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/lint/html-lint.js
rename to src/vitis/client/javascript/externs/codemirror/addon/lint/html-lint.js
diff --git a/vmap/client/javascript/externs/codemirror/addon/lint/javascript-lint.js b/src/vitis/client/javascript/externs/codemirror/addon/lint/javascript-lint.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/lint/javascript-lint.js
rename to src/vitis/client/javascript/externs/codemirror/addon/lint/javascript-lint.js
diff --git a/vmap/client/javascript/externs/codemirror/addon/lint/json-lint.js b/src/vitis/client/javascript/externs/codemirror/addon/lint/json-lint.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/lint/json-lint.js
rename to src/vitis/client/javascript/externs/codemirror/addon/lint/json-lint.js
diff --git a/vmap/client/javascript/externs/codemirror/addon/lint/lint.css b/src/vitis/client/javascript/externs/codemirror/addon/lint/lint.css
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/lint/lint.css
rename to src/vitis/client/javascript/externs/codemirror/addon/lint/lint.css
diff --git a/vmap/client/javascript/externs/codemirror/addon/lint/lint.js b/src/vitis/client/javascript/externs/codemirror/addon/lint/lint.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/lint/lint.js
rename to src/vitis/client/javascript/externs/codemirror/addon/lint/lint.js
diff --git a/vmap/client/javascript/externs/codemirror/addon/lint/yaml-lint.js b/src/vitis/client/javascript/externs/codemirror/addon/lint/yaml-lint.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/lint/yaml-lint.js
rename to src/vitis/client/javascript/externs/codemirror/addon/lint/yaml-lint.js
diff --git a/vmap/client/javascript/externs/codemirror/addon/merge/merge.css b/src/vitis/client/javascript/externs/codemirror/addon/merge/merge.css
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/merge/merge.css
rename to src/vitis/client/javascript/externs/codemirror/addon/merge/merge.css
diff --git a/vmap/client/javascript/externs/codemirror/addon/merge/merge.js b/src/vitis/client/javascript/externs/codemirror/addon/merge/merge.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/merge/merge.js
rename to src/vitis/client/javascript/externs/codemirror/addon/merge/merge.js
diff --git a/vmap/client/javascript/externs/codemirror/addon/mode/loadmode.js b/src/vitis/client/javascript/externs/codemirror/addon/mode/loadmode.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/mode/loadmode.js
rename to src/vitis/client/javascript/externs/codemirror/addon/mode/loadmode.js
diff --git a/vmap/client/javascript/externs/codemirror/addon/mode/multiplex.js b/src/vitis/client/javascript/externs/codemirror/addon/mode/multiplex.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/mode/multiplex.js
rename to src/vitis/client/javascript/externs/codemirror/addon/mode/multiplex.js
diff --git a/vmap/client/javascript/externs/codemirror/addon/mode/multiplex_test.js b/src/vitis/client/javascript/externs/codemirror/addon/mode/multiplex_test.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/mode/multiplex_test.js
rename to src/vitis/client/javascript/externs/codemirror/addon/mode/multiplex_test.js
diff --git a/vmap/client/javascript/externs/codemirror/addon/mode/overlay.js b/src/vitis/client/javascript/externs/codemirror/addon/mode/overlay.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/mode/overlay.js
rename to src/vitis/client/javascript/externs/codemirror/addon/mode/overlay.js
diff --git a/vmap/client/javascript/externs/codemirror/addon/mode/simple.js b/src/vitis/client/javascript/externs/codemirror/addon/mode/simple.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/mode/simple.js
rename to src/vitis/client/javascript/externs/codemirror/addon/mode/simple.js
diff --git a/vmap/client/javascript/externs/codemirror/addon/runmode/colorize.js b/src/vitis/client/javascript/externs/codemirror/addon/runmode/colorize.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/runmode/colorize.js
rename to src/vitis/client/javascript/externs/codemirror/addon/runmode/colorize.js
diff --git a/vmap/client/javascript/externs/codemirror/addon/runmode/runmode-standalone.js b/src/vitis/client/javascript/externs/codemirror/addon/runmode/runmode-standalone.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/runmode/runmode-standalone.js
rename to src/vitis/client/javascript/externs/codemirror/addon/runmode/runmode-standalone.js
diff --git a/vmap/client/javascript/externs/codemirror/addon/runmode/runmode.js b/src/vitis/client/javascript/externs/codemirror/addon/runmode/runmode.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/runmode/runmode.js
rename to src/vitis/client/javascript/externs/codemirror/addon/runmode/runmode.js
diff --git a/vmap/client/javascript/externs/codemirror/addon/runmode/runmode.node.js b/src/vitis/client/javascript/externs/codemirror/addon/runmode/runmode.node.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/runmode/runmode.node.js
rename to src/vitis/client/javascript/externs/codemirror/addon/runmode/runmode.node.js
diff --git a/vmap/client/javascript/externs/codemirror/addon/scroll/annotatescrollbar.js b/src/vitis/client/javascript/externs/codemirror/addon/scroll/annotatescrollbar.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/scroll/annotatescrollbar.js
rename to src/vitis/client/javascript/externs/codemirror/addon/scroll/annotatescrollbar.js
diff --git a/vmap/client/javascript/externs/codemirror/addon/scroll/scrollpastend.js b/src/vitis/client/javascript/externs/codemirror/addon/scroll/scrollpastend.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/scroll/scrollpastend.js
rename to src/vitis/client/javascript/externs/codemirror/addon/scroll/scrollpastend.js
diff --git a/vmap/client/javascript/externs/codemirror/addon/scroll/simplescrollbars.css b/src/vitis/client/javascript/externs/codemirror/addon/scroll/simplescrollbars.css
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/scroll/simplescrollbars.css
rename to src/vitis/client/javascript/externs/codemirror/addon/scroll/simplescrollbars.css
diff --git a/vmap/client/javascript/externs/codemirror/addon/scroll/simplescrollbars.js b/src/vitis/client/javascript/externs/codemirror/addon/scroll/simplescrollbars.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/scroll/simplescrollbars.js
rename to src/vitis/client/javascript/externs/codemirror/addon/scroll/simplescrollbars.js
diff --git a/vmap/client/javascript/externs/codemirror/addon/search/jump-to-line.js b/src/vitis/client/javascript/externs/codemirror/addon/search/jump-to-line.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/search/jump-to-line.js
rename to src/vitis/client/javascript/externs/codemirror/addon/search/jump-to-line.js
diff --git a/vmap/client/javascript/externs/codemirror/addon/search/match-highlighter.js b/src/vitis/client/javascript/externs/codemirror/addon/search/match-highlighter.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/search/match-highlighter.js
rename to src/vitis/client/javascript/externs/codemirror/addon/search/match-highlighter.js
diff --git a/vmap/client/javascript/externs/codemirror/addon/search/matchesonscrollbar.css b/src/vitis/client/javascript/externs/codemirror/addon/search/matchesonscrollbar.css
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/search/matchesonscrollbar.css
rename to src/vitis/client/javascript/externs/codemirror/addon/search/matchesonscrollbar.css
diff --git a/vmap/client/javascript/externs/codemirror/addon/search/matchesonscrollbar.js b/src/vitis/client/javascript/externs/codemirror/addon/search/matchesonscrollbar.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/search/matchesonscrollbar.js
rename to src/vitis/client/javascript/externs/codemirror/addon/search/matchesonscrollbar.js
diff --git a/vmap/client/javascript/externs/codemirror/addon/search/search.js b/src/vitis/client/javascript/externs/codemirror/addon/search/search.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/search/search.js
rename to src/vitis/client/javascript/externs/codemirror/addon/search/search.js
diff --git a/vmap/client/javascript/externs/codemirror/addon/search/searchcursor.js b/src/vitis/client/javascript/externs/codemirror/addon/search/searchcursor.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/search/searchcursor.js
rename to src/vitis/client/javascript/externs/codemirror/addon/search/searchcursor.js
diff --git a/vmap/client/javascript/externs/codemirror/addon/selection/active-line.js b/src/vitis/client/javascript/externs/codemirror/addon/selection/active-line.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/selection/active-line.js
rename to src/vitis/client/javascript/externs/codemirror/addon/selection/active-line.js
diff --git a/vmap/client/javascript/externs/codemirror/addon/selection/mark-selection.js b/src/vitis/client/javascript/externs/codemirror/addon/selection/mark-selection.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/selection/mark-selection.js
rename to src/vitis/client/javascript/externs/codemirror/addon/selection/mark-selection.js
diff --git a/vmap/client/javascript/externs/codemirror/addon/selection/selection-pointer.js b/src/vitis/client/javascript/externs/codemirror/addon/selection/selection-pointer.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/selection/selection-pointer.js
rename to src/vitis/client/javascript/externs/codemirror/addon/selection/selection-pointer.js
diff --git a/vmap/client/javascript/externs/codemirror/addon/tern/tern.css b/src/vitis/client/javascript/externs/codemirror/addon/tern/tern.css
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/tern/tern.css
rename to src/vitis/client/javascript/externs/codemirror/addon/tern/tern.css
diff --git a/vmap/client/javascript/externs/codemirror/addon/tern/tern.js b/src/vitis/client/javascript/externs/codemirror/addon/tern/tern.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/tern/tern.js
rename to src/vitis/client/javascript/externs/codemirror/addon/tern/tern.js
diff --git a/vmap/client/javascript/externs/codemirror/addon/tern/worker.js b/src/vitis/client/javascript/externs/codemirror/addon/tern/worker.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/tern/worker.js
rename to src/vitis/client/javascript/externs/codemirror/addon/tern/worker.js
diff --git a/vmap/client/javascript/externs/codemirror/addon/wrap/hardwrap.js b/src/vitis/client/javascript/externs/codemirror/addon/wrap/hardwrap.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/addon/wrap/hardwrap.js
rename to src/vitis/client/javascript/externs/codemirror/addon/wrap/hardwrap.js
diff --git a/vmap/client/javascript/externs/codemirror/clike.js b/src/vitis/client/javascript/externs/codemirror/clike.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/clike.js
rename to src/vitis/client/javascript/externs/codemirror/clike.js
diff --git a/vmap/client/javascript/externs/codemirror/codemirror.js b/src/vitis/client/javascript/externs/codemirror/codemirror.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/codemirror.js
rename to src/vitis/client/javascript/externs/codemirror/codemirror.js
diff --git a/vmap/client/javascript/externs/codemirror/codemirror.min.js b/src/vitis/client/javascript/externs/codemirror/codemirror.min.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/codemirror.min.js
rename to src/vitis/client/javascript/externs/codemirror/codemirror.min.js
diff --git a/vmap/client/javascript/externs/codemirror/css.js b/src/vitis/client/javascript/externs/codemirror/css.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/css.js
rename to src/vitis/client/javascript/externs/codemirror/css.js
diff --git a/vmap/client/javascript/externs/codemirror/htmlmixed.js b/src/vitis/client/javascript/externs/codemirror/htmlmixed.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/htmlmixed.js
rename to src/vitis/client/javascript/externs/codemirror/htmlmixed.js
diff --git a/vmap/client/javascript/externs/codemirror/javascript.js b/src/vitis/client/javascript/externs/codemirror/javascript.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/javascript.js
rename to src/vitis/client/javascript/externs/codemirror/javascript.js
diff --git a/vmap/client/javascript/externs/codemirror/map.js b/src/vitis/client/javascript/externs/codemirror/map.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/map.js
rename to src/vitis/client/javascript/externs/codemirror/map.js
diff --git a/vmap/client/javascript/externs/codemirror/php.js b/src/vitis/client/javascript/externs/codemirror/php.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/php.js
rename to src/vitis/client/javascript/externs/codemirror/php.js
diff --git a/vmap/client/javascript/externs/codemirror/show-hint.js b/src/vitis/client/javascript/externs/codemirror/show-hint.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/show-hint.js
rename to src/vitis/client/javascript/externs/codemirror/show-hint.js
diff --git a/vmap/client/javascript/externs/codemirror/sql.js b/src/vitis/client/javascript/externs/codemirror/sql.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/sql.js
rename to src/vitis/client/javascript/externs/codemirror/sql.js
diff --git a/vmap/client/javascript/externs/codemirror/xml.js b/src/vitis/client/javascript/externs/codemirror/xml.js
similarity index 100%
rename from vmap/client/javascript/externs/codemirror/xml.js
rename to src/vitis/client/javascript/externs/codemirror/xml.js
diff --git a/vmap/client/javascript/externs/formReader/component/component.js b/src/vitis/client/javascript/externs/formReader/component/component.js
similarity index 100%
rename from vmap/client/javascript/externs/formReader/component/component.js
rename to src/vitis/client/javascript/externs/formReader/component/component.js
diff --git a/vmap/client/javascript/externs/formReader/component/map.js b/src/vitis/client/javascript/externs/formReader/component/map.js
similarity index 100%
rename from vmap/client/javascript/externs/formReader/component/map.js
rename to src/vitis/client/javascript/externs/formReader/component/map.js
diff --git a/vmap/client/javascript/externs/formReader/component/map_workbench/map_workbench.html b/src/vitis/client/javascript/externs/formReader/component/map_workbench/map_workbench.html
similarity index 100%
rename from vmap/client/javascript/externs/formReader/component/map_workbench/map_workbench.html
rename to src/vitis/client/javascript/externs/formReader/component/map_workbench/map_workbench.html
diff --git a/vmap/client/javascript/externs/formReader/component/map_workbench/map_workbench.js b/src/vitis/client/javascript/externs/formReader/component/map_workbench/map_workbench.js
similarity index 100%
rename from vmap/client/javascript/externs/formReader/component/map_workbench/map_workbench.js
rename to src/vitis/client/javascript/externs/formReader/component/map_workbench/map_workbench.js
diff --git a/vmap/client/javascript/externs/formReader/formReader.html b/src/vitis/client/javascript/externs/formReader/formReader.html
similarity index 100%
rename from vmap/client/javascript/externs/formReader/formReader.html
rename to src/vitis/client/javascript/externs/formReader/formReader.html
diff --git a/vmap/client/javascript/externs/formReader/formReader.js b/src/vitis/client/javascript/externs/formReader/formReader.js
similarity index 100%
rename from vmap/client/javascript/externs/formReader/formReader.js
rename to src/vitis/client/javascript/externs/formReader/formReader.js
diff --git a/vmap/client/javascript/externs/formReader/formReaderCtrl.js b/src/vitis/client/javascript/externs/formReader/formReaderCtrl.js
old mode 100644
new mode 100755
similarity index 100%
rename from vmap/client/javascript/externs/formReader/formReaderCtrl.js
rename to src/vitis/client/javascript/externs/formReader/formReaderCtrl.js
diff --git a/vmap/client/javascript/externs/formReader/formReaderDrtv.js b/src/vitis/client/javascript/externs/formReader/formReaderDrtv.js
old mode 100644
new mode 100755
similarity index 99%
rename from vmap/client/javascript/externs/formReader/formReaderDrtv.js
rename to src/vitis/client/javascript/externs/formReader/formReaderDrtv.js
index 7b19b2d53801ca4cab7753e51af17f6a0fad2432..8a05fcbcc3825e887aac6e79b19bcde9f9883a73
--- a/vmap/client/javascript/externs/formReader/formReaderDrtv.js
+++ b/src/vitis/client/javascript/externs/formReader/formReaderDrtv.js
@@ -1430,7 +1430,6 @@ formReader.appFormFieldSpecificParamsDrtv = function ($timeout, $translate, prop
                         };
                         // Supprime le noeud coché de la liste.
                         oTreeviewOptions["onNodeUnchecked"] = function (event, data) {
-                            console.log(data);
                             // Décoche toute l'arborescence du noeud.
                             if (typeof (data["nodes"]) != "undefined" && oTreeviewOptions["recursiveCheck"]) {
                                 for (var i in data["nodes"])
diff --git a/vmap/client/javascript/externs/formReader/formReaderSrvc.js b/src/vitis/client/javascript/externs/formReader/formReaderSrvc.js
old mode 100644
new mode 100755
similarity index 99%
rename from vmap/client/javascript/externs/formReader/formReaderSrvc.js
rename to src/vitis/client/javascript/externs/formReader/formReaderSrvc.js
index 519bc7b77c934c0c1ca570b257a8f7d912be1ee8..fa87a6bb317b9228a6f768e55933c7887885dca3
--- a/vmap/client/javascript/externs/formReader/formReaderSrvc.js
+++ b/src/vitis/client/javascript/externs/formReader/formReaderSrvc.js
@@ -623,7 +623,7 @@ formReader.formReaderService = function ($translate, $rootScope, $q, $log, $time
         },
         /**
          * isTernaryString function.
-         * La chaine de caractère passée est une expression ternaire ? 
+         * La chaine de caractère passée est une expression ternaire ?
          * @param {string} sString Chaine de caractère.
          * @return {boolean}
          */
diff --git a/vmap/client/javascript/externs/jquery/LICENSE.txt b/src/vitis/client/javascript/externs/jquery/LICENSE.txt
similarity index 100%
rename from vmap/client/javascript/externs/jquery/LICENSE.txt
rename to src/vitis/client/javascript/externs/jquery/LICENSE.txt
diff --git a/vmap/client/javascript/externs/jquery/jquery-1.11.3.js b/src/vitis/client/javascript/externs/jquery/jquery-1.11.3.js
similarity index 100%
rename from vmap/client/javascript/externs/jquery/jquery-1.11.3.js
rename to src/vitis/client/javascript/externs/jquery/jquery-1.11.3.js
diff --git a/vmap/client/javascript/externs/jquery/jquery-1.11.3.min.js b/src/vitis/client/javascript/externs/jquery/jquery-1.11.3.min.js
similarity index 100%
rename from vmap/client/javascript/externs/jquery/jquery-1.11.3.min.js
rename to src/vitis/client/javascript/externs/jquery/jquery-1.11.3.min.js
diff --git a/vmap/client/javascript/externs/jquery/jquery-1.11.3.min.map b/src/vitis/client/javascript/externs/jquery/jquery-1.11.3.min.map
similarity index 100%
rename from vmap/client/javascript/externs/jquery/jquery-1.11.3.min.map
rename to src/vitis/client/javascript/externs/jquery/jquery-1.11.3.min.map
diff --git a/vmap/client/javascript/externs/jquery/plugins/bootbox/bootbox.js b/src/vitis/client/javascript/externs/jquery/plugins/bootbox/bootbox.js
similarity index 100%
rename from vmap/client/javascript/externs/jquery/plugins/bootbox/bootbox.js
rename to src/vitis/client/javascript/externs/jquery/plugins/bootbox/bootbox.js
diff --git a/vmap/client/javascript/externs/jquery/plugins/bootbox/bootbox.min.js b/src/vitis/client/javascript/externs/jquery/plugins/bootbox/bootbox.min.js
similarity index 100%
rename from vmap/client/javascript/externs/jquery/plugins/bootbox/bootbox.min.js
rename to src/vitis/client/javascript/externs/jquery/plugins/bootbox/bootbox.min.js
diff --git a/vmap/client/javascript/externs/jquery/plugins/bootstrap-colorpicker/bootstrap-colorpicker.min.js b/src/vitis/client/javascript/externs/jquery/plugins/bootstrap-colorpicker/bootstrap-colorpicker.min.js
similarity index 100%
rename from vmap/client/javascript/externs/jquery/plugins/bootstrap-colorpicker/bootstrap-colorpicker.min.js
rename to src/vitis/client/javascript/externs/jquery/plugins/bootstrap-colorpicker/bootstrap-colorpicker.min.js
diff --git a/vmap/client/javascript/externs/jquery/plugins/bootstrap-colorpicker/js/bootstrap-colorpicker.js b/src/vitis/client/javascript/externs/jquery/plugins/bootstrap-colorpicker/js/bootstrap-colorpicker.js
similarity index 100%
rename from vmap/client/javascript/externs/jquery/plugins/bootstrap-colorpicker/js/bootstrap-colorpicker.js
rename to src/vitis/client/javascript/externs/jquery/plugins/bootstrap-colorpicker/js/bootstrap-colorpicker.js
diff --git a/vmap/client/javascript/externs/jquery/plugins/bootstrap-colorpicker/js/bootstrap-colorpicker.min.js b/src/vitis/client/javascript/externs/jquery/plugins/bootstrap-colorpicker/js/bootstrap-colorpicker.min.js
similarity index 100%
rename from vmap/client/javascript/externs/jquery/plugins/bootstrap-colorpicker/js/bootstrap-colorpicker.min.js
rename to src/vitis/client/javascript/externs/jquery/plugins/bootstrap-colorpicker/js/bootstrap-colorpicker.min.js
diff --git a/vmap/client/javascript/externs/jquery/plugins/bootstrap-confirmation/bootstrap-confirmation.min.js b/src/vitis/client/javascript/externs/jquery/plugins/bootstrap-confirmation/bootstrap-confirmation.min.js
similarity index 100%
rename from vmap/client/javascript/externs/jquery/plugins/bootstrap-confirmation/bootstrap-confirmation.min.js
rename to src/vitis/client/javascript/externs/jquery/plugins/bootstrap-confirmation/bootstrap-confirmation.min.js
diff --git a/vmap/client/javascript/externs/jquery/plugins/bootstrap-datepicker/bootstrap-datepicker.js b/src/vitis/client/javascript/externs/jquery/plugins/bootstrap-datepicker/bootstrap-datepicker.js
similarity index 100%
rename from vmap/client/javascript/externs/jquery/plugins/bootstrap-datepicker/bootstrap-datepicker.js
rename to src/vitis/client/javascript/externs/jquery/plugins/bootstrap-datepicker/bootstrap-datepicker.js
diff --git a/vmap/client/javascript/externs/jquery/plugins/bootstrap-datepicker/bootstrap-datepicker.min.js b/src/vitis/client/javascript/externs/jquery/plugins/bootstrap-datepicker/bootstrap-datepicker.min.js
similarity index 100%
rename from vmap/client/javascript/externs/jquery/plugins/bootstrap-datepicker/bootstrap-datepicker.min.js
rename to src/vitis/client/javascript/externs/jquery/plugins/bootstrap-datepicker/bootstrap-datepicker.min.js
diff --git a/vmap/client/javascript/externs/jquery/plugins/bootstrap-datepicker/locales/bootstrap-datepicker.fr.min.js b/src/vitis/client/javascript/externs/jquery/plugins/bootstrap-datepicker/locales/bootstrap-datepicker.fr.min.js
similarity index 100%
rename from vmap/client/javascript/externs/jquery/plugins/bootstrap-datepicker/locales/bootstrap-datepicker.fr.min.js
rename to src/vitis/client/javascript/externs/jquery/plugins/bootstrap-datepicker/locales/bootstrap-datepicker.fr.min.js
diff --git a/vmap/client/javascript/externs/jquery/plugins/bootstrap-datetimepicker/bootstrap-datetimepicker.min.js b/src/vitis/client/javascript/externs/jquery/plugins/bootstrap-datetimepicker/bootstrap-datetimepicker.min.js
similarity index 100%
rename from vmap/client/javascript/externs/jquery/plugins/bootstrap-datetimepicker/bootstrap-datetimepicker.min.js
rename to src/vitis/client/javascript/externs/jquery/plugins/bootstrap-datetimepicker/bootstrap-datetimepicker.min.js
diff --git a/vmap/client/javascript/externs/jquery/plugins/bootstrap-fileinput/fileinput.js b/src/vitis/client/javascript/externs/jquery/plugins/bootstrap-fileinput/fileinput.js
similarity index 100%
rename from vmap/client/javascript/externs/jquery/plugins/bootstrap-fileinput/fileinput.js
rename to src/vitis/client/javascript/externs/jquery/plugins/bootstrap-fileinput/fileinput.js
diff --git a/vmap/client/javascript/externs/jquery/plugins/bootstrap-fileinput/fileinput.min.js b/src/vitis/client/javascript/externs/jquery/plugins/bootstrap-fileinput/fileinput.min.js
similarity index 100%
rename from vmap/client/javascript/externs/jquery/plugins/bootstrap-fileinput/fileinput.min.js
rename to src/vitis/client/javascript/externs/jquery/plugins/bootstrap-fileinput/fileinput.min.js
diff --git a/vmap/client/javascript/externs/jquery/plugins/bootstrap-fileinput/fileinput_locale_fr.js b/src/vitis/client/javascript/externs/jquery/plugins/bootstrap-fileinput/fileinput_locale_fr.js
similarity index 100%
rename from vmap/client/javascript/externs/jquery/plugins/bootstrap-fileinput/fileinput_locale_fr.js
rename to src/vitis/client/javascript/externs/jquery/plugins/bootstrap-fileinput/fileinput_locale_fr.js
diff --git a/vmap/client/javascript/externs/jquery/plugins/bootstrap-slider/bootstrap-slider.min.js b/src/vitis/client/javascript/externs/jquery/plugins/bootstrap-slider/bootstrap-slider.min.js
similarity index 100%
rename from vmap/client/javascript/externs/jquery/plugins/bootstrap-slider/bootstrap-slider.min.js
rename to src/vitis/client/javascript/externs/jquery/plugins/bootstrap-slider/bootstrap-slider.min.js
diff --git a/vmap/client/javascript/externs/jquery/plugins/bootstrap-tagsinput/bootstrap-tagsinput.min.js b/src/vitis/client/javascript/externs/jquery/plugins/bootstrap-tagsinput/bootstrap-tagsinput.min.js
similarity index 100%
rename from vmap/client/javascript/externs/jquery/plugins/bootstrap-tagsinput/bootstrap-tagsinput.min.js
rename to src/vitis/client/javascript/externs/jquery/plugins/bootstrap-tagsinput/bootstrap-tagsinput.min.js
diff --git a/vmap/client/javascript/externs/jquery/plugins/bootstrap-treeview/bootstrap-treeview.js b/src/vitis/client/javascript/externs/jquery/plugins/bootstrap-treeview/bootstrap-treeview.js
similarity index 100%
rename from vmap/client/javascript/externs/jquery/plugins/bootstrap-treeview/bootstrap-treeview.js
rename to src/vitis/client/javascript/externs/jquery/plugins/bootstrap-treeview/bootstrap-treeview.js
diff --git a/vmap/client/javascript/externs/jquery/plugins/bootstrap-treeview/bootstrap-treeview.min.js b/src/vitis/client/javascript/externs/jquery/plugins/bootstrap-treeview/bootstrap-treeview.min.js
similarity index 100%
rename from vmap/client/javascript/externs/jquery/plugins/bootstrap-treeview/bootstrap-treeview.min.js
rename to src/vitis/client/javascript/externs/jquery/plugins/bootstrap-treeview/bootstrap-treeview.min.js
diff --git a/vmap/client/javascript/externs/jquery/plugins/malihu-custom-scrollbar/jquery.mCustomScrollbar.concat.min.js b/src/vitis/client/javascript/externs/jquery/plugins/malihu-custom-scrollbar/jquery.mCustomScrollbar.concat.min.js
similarity index 100%
rename from vmap/client/javascript/externs/jquery/plugins/malihu-custom-scrollbar/jquery.mCustomScrollbar.concat.min.js
rename to src/vitis/client/javascript/externs/jquery/plugins/malihu-custom-scrollbar/jquery.mCustomScrollbar.concat.min.js
diff --git a/vmap/client/javascript/externs/jquery/plugins/notify/notify.js b/src/vitis/client/javascript/externs/jquery/plugins/notify/notify.js
similarity index 100%
rename from vmap/client/javascript/externs/jquery/plugins/notify/notify.js
rename to src/vitis/client/javascript/externs/jquery/plugins/notify/notify.js
diff --git a/vmap/client/javascript/externs/jquery/plugins/notify/notify.min.js b/src/vitis/client/javascript/externs/jquery/plugins/notify/notify.min.js
similarity index 100%
rename from vmap/client/javascript/externs/jquery/plugins/notify/notify.min.js
rename to src/vitis/client/javascript/externs/jquery/plugins/notify/notify.min.js
diff --git a/vmap/client/javascript/externs/less/LICENSE b/src/vitis/client/javascript/externs/less/LICENSE
similarity index 100%
rename from vmap/client/javascript/externs/less/LICENSE
rename to src/vitis/client/javascript/externs/less/LICENSE
diff --git a/vmap/client/javascript/externs/less/less.min.js b/src/vitis/client/javascript/externs/less/less.min.js
similarity index 100%
rename from vmap/client/javascript/externs/less/less.min.js
rename to src/vitis/client/javascript/externs/less/less.min.js
diff --git a/vmap/client/javascript/externs/letter-avatar/ngletteravatar.js b/src/vitis/client/javascript/externs/letter-avatar/ngletteravatar.js
similarity index 100%
rename from vmap/client/javascript/externs/letter-avatar/ngletteravatar.js
rename to src/vitis/client/javascript/externs/letter-avatar/ngletteravatar.js
diff --git a/vmap/client/javascript/externs/letter-avatar/ngletteravatar.min.js b/src/vitis/client/javascript/externs/letter-avatar/ngletteravatar.min.js
similarity index 100%
rename from vmap/client/javascript/externs/letter-avatar/ngletteravatar.min.js
rename to src/vitis/client/javascript/externs/letter-avatar/ngletteravatar.min.js
diff --git a/vmap/client/javascript/externs/mapJSON/MapJSON.js b/src/vitis/client/javascript/externs/mapJSON/MapJSON.js
old mode 100644
new mode 100755
similarity index 100%
rename from vmap/client/javascript/externs/mapJSON/MapJSON.js
rename to src/vitis/client/javascript/externs/mapJSON/MapJSON.js
diff --git a/vmap/client/javascript/externs/materialize/materialize.js b/src/vitis/client/javascript/externs/materialize/materialize.js
similarity index 100%
rename from vmap/client/javascript/externs/materialize/materialize.js
rename to src/vitis/client/javascript/externs/materialize/materialize.js
diff --git a/vmap/client/javascript/externs/materialize/materialize.min.js b/src/vitis/client/javascript/externs/materialize/materialize.min.js
similarity index 100%
rename from vmap/client/javascript/externs/materialize/materialize.min.js
rename to src/vitis/client/javascript/externs/materialize/materialize.min.js
diff --git a/vmap/client/javascript/externs/mobile-detect/LICENSE b/src/vitis/client/javascript/externs/mobile-detect/LICENSE
similarity index 100%
rename from vmap/client/javascript/externs/mobile-detect/LICENSE
rename to src/vitis/client/javascript/externs/mobile-detect/LICENSE
diff --git a/vmap/client/javascript/externs/mobile-detect/mobile-detect.js b/src/vitis/client/javascript/externs/mobile-detect/mobile-detect.js
similarity index 100%
rename from vmap/client/javascript/externs/mobile-detect/mobile-detect.js
rename to src/vitis/client/javascript/externs/mobile-detect/mobile-detect.js
diff --git a/vmap/client/javascript/externs/mobile-detect/mobile-detect.min.js b/src/vitis/client/javascript/externs/mobile-detect/mobile-detect.min.js
similarity index 100%
rename from vmap/client/javascript/externs/mobile-detect/mobile-detect.min.js
rename to src/vitis/client/javascript/externs/mobile-detect/mobile-detect.min.js
diff --git a/vmap/client/javascript/externs/moment/LICENSE b/src/vitis/client/javascript/externs/moment/LICENSE
similarity index 100%
rename from vmap/client/javascript/externs/moment/LICENSE
rename to src/vitis/client/javascript/externs/moment/LICENSE
diff --git a/vmap/client/javascript/externs/moment/locale/af.js b/src/vitis/client/javascript/externs/moment/locale/af.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/af.js
rename to src/vitis/client/javascript/externs/moment/locale/af.js
diff --git a/vmap/client/javascript/externs/moment/locale/ar-ma.js b/src/vitis/client/javascript/externs/moment/locale/ar-ma.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/ar-ma.js
rename to src/vitis/client/javascript/externs/moment/locale/ar-ma.js
diff --git a/vmap/client/javascript/externs/moment/locale/ar-sa.js b/src/vitis/client/javascript/externs/moment/locale/ar-sa.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/ar-sa.js
rename to src/vitis/client/javascript/externs/moment/locale/ar-sa.js
diff --git a/vmap/client/javascript/externs/moment/locale/ar-tn.js b/src/vitis/client/javascript/externs/moment/locale/ar-tn.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/ar-tn.js
rename to src/vitis/client/javascript/externs/moment/locale/ar-tn.js
diff --git a/vmap/client/javascript/externs/moment/locale/ar.js b/src/vitis/client/javascript/externs/moment/locale/ar.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/ar.js
rename to src/vitis/client/javascript/externs/moment/locale/ar.js
diff --git a/vmap/client/javascript/externs/moment/locale/az.js b/src/vitis/client/javascript/externs/moment/locale/az.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/az.js
rename to src/vitis/client/javascript/externs/moment/locale/az.js
diff --git a/vmap/client/javascript/externs/moment/locale/be.js b/src/vitis/client/javascript/externs/moment/locale/be.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/be.js
rename to src/vitis/client/javascript/externs/moment/locale/be.js
diff --git a/vmap/client/javascript/externs/moment/locale/bg.js b/src/vitis/client/javascript/externs/moment/locale/bg.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/bg.js
rename to src/vitis/client/javascript/externs/moment/locale/bg.js
diff --git a/vmap/client/javascript/externs/moment/locale/bn.js b/src/vitis/client/javascript/externs/moment/locale/bn.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/bn.js
rename to src/vitis/client/javascript/externs/moment/locale/bn.js
diff --git a/vmap/client/javascript/externs/moment/locale/bo.js b/src/vitis/client/javascript/externs/moment/locale/bo.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/bo.js
rename to src/vitis/client/javascript/externs/moment/locale/bo.js
diff --git a/vmap/client/javascript/externs/moment/locale/br.js b/src/vitis/client/javascript/externs/moment/locale/br.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/br.js
rename to src/vitis/client/javascript/externs/moment/locale/br.js
diff --git a/vmap/client/javascript/externs/moment/locale/bs.js b/src/vitis/client/javascript/externs/moment/locale/bs.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/bs.js
rename to src/vitis/client/javascript/externs/moment/locale/bs.js
diff --git a/vmap/client/javascript/externs/moment/locale/ca.js b/src/vitis/client/javascript/externs/moment/locale/ca.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/ca.js
rename to src/vitis/client/javascript/externs/moment/locale/ca.js
diff --git a/vmap/client/javascript/externs/moment/locale/cs.js b/src/vitis/client/javascript/externs/moment/locale/cs.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/cs.js
rename to src/vitis/client/javascript/externs/moment/locale/cs.js
diff --git a/vmap/client/javascript/externs/moment/locale/cv.js b/src/vitis/client/javascript/externs/moment/locale/cv.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/cv.js
rename to src/vitis/client/javascript/externs/moment/locale/cv.js
diff --git a/vmap/client/javascript/externs/moment/locale/cy.js b/src/vitis/client/javascript/externs/moment/locale/cy.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/cy.js
rename to src/vitis/client/javascript/externs/moment/locale/cy.js
diff --git a/vmap/client/javascript/externs/moment/locale/da.js b/src/vitis/client/javascript/externs/moment/locale/da.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/da.js
rename to src/vitis/client/javascript/externs/moment/locale/da.js
diff --git a/vmap/client/javascript/externs/moment/locale/de-at.js b/src/vitis/client/javascript/externs/moment/locale/de-at.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/de-at.js
rename to src/vitis/client/javascript/externs/moment/locale/de-at.js
diff --git a/vmap/client/javascript/externs/moment/locale/de.js b/src/vitis/client/javascript/externs/moment/locale/de.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/de.js
rename to src/vitis/client/javascript/externs/moment/locale/de.js
diff --git a/vmap/client/javascript/externs/moment/locale/dv.js b/src/vitis/client/javascript/externs/moment/locale/dv.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/dv.js
rename to src/vitis/client/javascript/externs/moment/locale/dv.js
diff --git a/vmap/client/javascript/externs/moment/locale/el.js b/src/vitis/client/javascript/externs/moment/locale/el.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/el.js
rename to src/vitis/client/javascript/externs/moment/locale/el.js
diff --git a/vmap/client/javascript/externs/moment/locale/en-au.js b/src/vitis/client/javascript/externs/moment/locale/en-au.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/en-au.js
rename to src/vitis/client/javascript/externs/moment/locale/en-au.js
diff --git a/vmap/client/javascript/externs/moment/locale/en-ca.js b/src/vitis/client/javascript/externs/moment/locale/en-ca.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/en-ca.js
rename to src/vitis/client/javascript/externs/moment/locale/en-ca.js
diff --git a/vmap/client/javascript/externs/moment/locale/en-gb.js b/src/vitis/client/javascript/externs/moment/locale/en-gb.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/en-gb.js
rename to src/vitis/client/javascript/externs/moment/locale/en-gb.js
diff --git a/vmap/client/javascript/externs/moment/locale/en-ie.js b/src/vitis/client/javascript/externs/moment/locale/en-ie.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/en-ie.js
rename to src/vitis/client/javascript/externs/moment/locale/en-ie.js
diff --git a/vmap/client/javascript/externs/moment/locale/en-nz.js b/src/vitis/client/javascript/externs/moment/locale/en-nz.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/en-nz.js
rename to src/vitis/client/javascript/externs/moment/locale/en-nz.js
diff --git a/vmap/client/javascript/externs/moment/locale/eo.js b/src/vitis/client/javascript/externs/moment/locale/eo.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/eo.js
rename to src/vitis/client/javascript/externs/moment/locale/eo.js
diff --git a/vmap/client/javascript/externs/moment/locale/es.js b/src/vitis/client/javascript/externs/moment/locale/es.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/es.js
rename to src/vitis/client/javascript/externs/moment/locale/es.js
diff --git a/vmap/client/javascript/externs/moment/locale/et.js b/src/vitis/client/javascript/externs/moment/locale/et.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/et.js
rename to src/vitis/client/javascript/externs/moment/locale/et.js
diff --git a/vmap/client/javascript/externs/moment/locale/eu.js b/src/vitis/client/javascript/externs/moment/locale/eu.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/eu.js
rename to src/vitis/client/javascript/externs/moment/locale/eu.js
diff --git a/vmap/client/javascript/externs/moment/locale/fa.js b/src/vitis/client/javascript/externs/moment/locale/fa.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/fa.js
rename to src/vitis/client/javascript/externs/moment/locale/fa.js
diff --git a/vmap/client/javascript/externs/moment/locale/fi.js b/src/vitis/client/javascript/externs/moment/locale/fi.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/fi.js
rename to src/vitis/client/javascript/externs/moment/locale/fi.js
diff --git a/vmap/client/javascript/externs/moment/locale/fo.js b/src/vitis/client/javascript/externs/moment/locale/fo.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/fo.js
rename to src/vitis/client/javascript/externs/moment/locale/fo.js
diff --git a/vmap/client/javascript/externs/moment/locale/fr-ca.js b/src/vitis/client/javascript/externs/moment/locale/fr-ca.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/fr-ca.js
rename to src/vitis/client/javascript/externs/moment/locale/fr-ca.js
diff --git a/vmap/client/javascript/externs/moment/locale/fr-ch.js b/src/vitis/client/javascript/externs/moment/locale/fr-ch.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/fr-ch.js
rename to src/vitis/client/javascript/externs/moment/locale/fr-ch.js
diff --git a/vmap/client/javascript/externs/moment/locale/fr.js b/src/vitis/client/javascript/externs/moment/locale/fr.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/fr.js
rename to src/vitis/client/javascript/externs/moment/locale/fr.js
diff --git a/vmap/client/javascript/externs/moment/locale/fy.js b/src/vitis/client/javascript/externs/moment/locale/fy.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/fy.js
rename to src/vitis/client/javascript/externs/moment/locale/fy.js
diff --git a/vmap/client/javascript/externs/moment/locale/gd.js b/src/vitis/client/javascript/externs/moment/locale/gd.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/gd.js
rename to src/vitis/client/javascript/externs/moment/locale/gd.js
diff --git a/vmap/client/javascript/externs/moment/locale/gl.js b/src/vitis/client/javascript/externs/moment/locale/gl.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/gl.js
rename to src/vitis/client/javascript/externs/moment/locale/gl.js
diff --git a/vmap/client/javascript/externs/moment/locale/he.js b/src/vitis/client/javascript/externs/moment/locale/he.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/he.js
rename to src/vitis/client/javascript/externs/moment/locale/he.js
diff --git a/vmap/client/javascript/externs/moment/locale/hi.js b/src/vitis/client/javascript/externs/moment/locale/hi.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/hi.js
rename to src/vitis/client/javascript/externs/moment/locale/hi.js
diff --git a/vmap/client/javascript/externs/moment/locale/hr.js b/src/vitis/client/javascript/externs/moment/locale/hr.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/hr.js
rename to src/vitis/client/javascript/externs/moment/locale/hr.js
diff --git a/vmap/client/javascript/externs/moment/locale/hu.js b/src/vitis/client/javascript/externs/moment/locale/hu.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/hu.js
rename to src/vitis/client/javascript/externs/moment/locale/hu.js
diff --git a/vmap/client/javascript/externs/moment/locale/hy-am.js b/src/vitis/client/javascript/externs/moment/locale/hy-am.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/hy-am.js
rename to src/vitis/client/javascript/externs/moment/locale/hy-am.js
diff --git a/vmap/client/javascript/externs/moment/locale/id.js b/src/vitis/client/javascript/externs/moment/locale/id.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/id.js
rename to src/vitis/client/javascript/externs/moment/locale/id.js
diff --git a/vmap/client/javascript/externs/moment/locale/is.js b/src/vitis/client/javascript/externs/moment/locale/is.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/is.js
rename to src/vitis/client/javascript/externs/moment/locale/is.js
diff --git a/vmap/client/javascript/externs/moment/locale/it.js b/src/vitis/client/javascript/externs/moment/locale/it.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/it.js
rename to src/vitis/client/javascript/externs/moment/locale/it.js
diff --git a/vmap/client/javascript/externs/moment/locale/ja.js b/src/vitis/client/javascript/externs/moment/locale/ja.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/ja.js
rename to src/vitis/client/javascript/externs/moment/locale/ja.js
diff --git a/vmap/client/javascript/externs/moment/locale/jv.js b/src/vitis/client/javascript/externs/moment/locale/jv.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/jv.js
rename to src/vitis/client/javascript/externs/moment/locale/jv.js
diff --git a/vmap/client/javascript/externs/moment/locale/ka.js b/src/vitis/client/javascript/externs/moment/locale/ka.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/ka.js
rename to src/vitis/client/javascript/externs/moment/locale/ka.js
diff --git a/vmap/client/javascript/externs/moment/locale/kk.js b/src/vitis/client/javascript/externs/moment/locale/kk.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/kk.js
rename to src/vitis/client/javascript/externs/moment/locale/kk.js
diff --git a/vmap/client/javascript/externs/moment/locale/km.js b/src/vitis/client/javascript/externs/moment/locale/km.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/km.js
rename to src/vitis/client/javascript/externs/moment/locale/km.js
diff --git a/vmap/client/javascript/externs/moment/locale/ko.js b/src/vitis/client/javascript/externs/moment/locale/ko.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/ko.js
rename to src/vitis/client/javascript/externs/moment/locale/ko.js
diff --git a/vmap/client/javascript/externs/moment/locale/lb.js b/src/vitis/client/javascript/externs/moment/locale/lb.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/lb.js
rename to src/vitis/client/javascript/externs/moment/locale/lb.js
diff --git a/vmap/client/javascript/externs/moment/locale/lo.js b/src/vitis/client/javascript/externs/moment/locale/lo.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/lo.js
rename to src/vitis/client/javascript/externs/moment/locale/lo.js
diff --git a/vmap/client/javascript/externs/moment/locale/lt.js b/src/vitis/client/javascript/externs/moment/locale/lt.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/lt.js
rename to src/vitis/client/javascript/externs/moment/locale/lt.js
diff --git a/vmap/client/javascript/externs/moment/locale/lv.js b/src/vitis/client/javascript/externs/moment/locale/lv.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/lv.js
rename to src/vitis/client/javascript/externs/moment/locale/lv.js
diff --git a/vmap/client/javascript/externs/moment/locale/me.js b/src/vitis/client/javascript/externs/moment/locale/me.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/me.js
rename to src/vitis/client/javascript/externs/moment/locale/me.js
diff --git a/vmap/client/javascript/externs/moment/locale/mk.js b/src/vitis/client/javascript/externs/moment/locale/mk.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/mk.js
rename to src/vitis/client/javascript/externs/moment/locale/mk.js
diff --git a/vmap/client/javascript/externs/moment/locale/ml.js b/src/vitis/client/javascript/externs/moment/locale/ml.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/ml.js
rename to src/vitis/client/javascript/externs/moment/locale/ml.js
diff --git a/vmap/client/javascript/externs/moment/locale/mr.js b/src/vitis/client/javascript/externs/moment/locale/mr.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/mr.js
rename to src/vitis/client/javascript/externs/moment/locale/mr.js
diff --git a/vmap/client/javascript/externs/moment/locale/ms-my.js b/src/vitis/client/javascript/externs/moment/locale/ms-my.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/ms-my.js
rename to src/vitis/client/javascript/externs/moment/locale/ms-my.js
diff --git a/vmap/client/javascript/externs/moment/locale/ms.js b/src/vitis/client/javascript/externs/moment/locale/ms.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/ms.js
rename to src/vitis/client/javascript/externs/moment/locale/ms.js
diff --git a/vmap/client/javascript/externs/moment/locale/my.js b/src/vitis/client/javascript/externs/moment/locale/my.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/my.js
rename to src/vitis/client/javascript/externs/moment/locale/my.js
diff --git a/vmap/client/javascript/externs/moment/locale/nb.js b/src/vitis/client/javascript/externs/moment/locale/nb.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/nb.js
rename to src/vitis/client/javascript/externs/moment/locale/nb.js
diff --git a/vmap/client/javascript/externs/moment/locale/ne.js b/src/vitis/client/javascript/externs/moment/locale/ne.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/ne.js
rename to src/vitis/client/javascript/externs/moment/locale/ne.js
diff --git a/vmap/client/javascript/externs/moment/locale/nl.js b/src/vitis/client/javascript/externs/moment/locale/nl.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/nl.js
rename to src/vitis/client/javascript/externs/moment/locale/nl.js
diff --git a/vmap/client/javascript/externs/moment/locale/nn.js b/src/vitis/client/javascript/externs/moment/locale/nn.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/nn.js
rename to src/vitis/client/javascript/externs/moment/locale/nn.js
diff --git a/vmap/client/javascript/externs/moment/locale/pl.js b/src/vitis/client/javascript/externs/moment/locale/pl.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/pl.js
rename to src/vitis/client/javascript/externs/moment/locale/pl.js
diff --git a/vmap/client/javascript/externs/moment/locale/pt-br.js b/src/vitis/client/javascript/externs/moment/locale/pt-br.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/pt-br.js
rename to src/vitis/client/javascript/externs/moment/locale/pt-br.js
diff --git a/vmap/client/javascript/externs/moment/locale/pt.js b/src/vitis/client/javascript/externs/moment/locale/pt.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/pt.js
rename to src/vitis/client/javascript/externs/moment/locale/pt.js
diff --git a/vmap/client/javascript/externs/moment/locale/ro.js b/src/vitis/client/javascript/externs/moment/locale/ro.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/ro.js
rename to src/vitis/client/javascript/externs/moment/locale/ro.js
diff --git a/vmap/client/javascript/externs/moment/locale/ru.js b/src/vitis/client/javascript/externs/moment/locale/ru.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/ru.js
rename to src/vitis/client/javascript/externs/moment/locale/ru.js
diff --git a/vmap/client/javascript/externs/moment/locale/se.js b/src/vitis/client/javascript/externs/moment/locale/se.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/se.js
rename to src/vitis/client/javascript/externs/moment/locale/se.js
diff --git a/vmap/client/javascript/externs/moment/locale/si.js b/src/vitis/client/javascript/externs/moment/locale/si.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/si.js
rename to src/vitis/client/javascript/externs/moment/locale/si.js
diff --git a/vmap/client/javascript/externs/moment/locale/sk.js b/src/vitis/client/javascript/externs/moment/locale/sk.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/sk.js
rename to src/vitis/client/javascript/externs/moment/locale/sk.js
diff --git a/vmap/client/javascript/externs/moment/locale/sl.js b/src/vitis/client/javascript/externs/moment/locale/sl.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/sl.js
rename to src/vitis/client/javascript/externs/moment/locale/sl.js
diff --git a/vmap/client/javascript/externs/moment/locale/sq.js b/src/vitis/client/javascript/externs/moment/locale/sq.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/sq.js
rename to src/vitis/client/javascript/externs/moment/locale/sq.js
diff --git a/vmap/client/javascript/externs/moment/locale/sr-cyrl.js b/src/vitis/client/javascript/externs/moment/locale/sr-cyrl.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/sr-cyrl.js
rename to src/vitis/client/javascript/externs/moment/locale/sr-cyrl.js
diff --git a/vmap/client/javascript/externs/moment/locale/sr.js b/src/vitis/client/javascript/externs/moment/locale/sr.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/sr.js
rename to src/vitis/client/javascript/externs/moment/locale/sr.js
diff --git a/vmap/client/javascript/externs/moment/locale/sv.js b/src/vitis/client/javascript/externs/moment/locale/sv.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/sv.js
rename to src/vitis/client/javascript/externs/moment/locale/sv.js
diff --git a/vmap/client/javascript/externs/moment/locale/sw.js b/src/vitis/client/javascript/externs/moment/locale/sw.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/sw.js
rename to src/vitis/client/javascript/externs/moment/locale/sw.js
diff --git a/vmap/client/javascript/externs/moment/locale/ta.js b/src/vitis/client/javascript/externs/moment/locale/ta.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/ta.js
rename to src/vitis/client/javascript/externs/moment/locale/ta.js
diff --git a/vmap/client/javascript/externs/moment/locale/te.js b/src/vitis/client/javascript/externs/moment/locale/te.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/te.js
rename to src/vitis/client/javascript/externs/moment/locale/te.js
diff --git a/vmap/client/javascript/externs/moment/locale/th.js b/src/vitis/client/javascript/externs/moment/locale/th.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/th.js
rename to src/vitis/client/javascript/externs/moment/locale/th.js
diff --git a/vmap/client/javascript/externs/moment/locale/tl-ph.js b/src/vitis/client/javascript/externs/moment/locale/tl-ph.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/tl-ph.js
rename to src/vitis/client/javascript/externs/moment/locale/tl-ph.js
diff --git a/vmap/client/javascript/externs/moment/locale/tlh.js b/src/vitis/client/javascript/externs/moment/locale/tlh.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/tlh.js
rename to src/vitis/client/javascript/externs/moment/locale/tlh.js
diff --git a/vmap/client/javascript/externs/moment/locale/tr.js b/src/vitis/client/javascript/externs/moment/locale/tr.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/tr.js
rename to src/vitis/client/javascript/externs/moment/locale/tr.js
diff --git a/vmap/client/javascript/externs/moment/locale/tzl.js b/src/vitis/client/javascript/externs/moment/locale/tzl.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/tzl.js
rename to src/vitis/client/javascript/externs/moment/locale/tzl.js
diff --git a/vmap/client/javascript/externs/moment/locale/tzm-latn.js b/src/vitis/client/javascript/externs/moment/locale/tzm-latn.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/tzm-latn.js
rename to src/vitis/client/javascript/externs/moment/locale/tzm-latn.js
diff --git a/vmap/client/javascript/externs/moment/locale/tzm.js b/src/vitis/client/javascript/externs/moment/locale/tzm.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/tzm.js
rename to src/vitis/client/javascript/externs/moment/locale/tzm.js
diff --git a/vmap/client/javascript/externs/moment/locale/uk.js b/src/vitis/client/javascript/externs/moment/locale/uk.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/uk.js
rename to src/vitis/client/javascript/externs/moment/locale/uk.js
diff --git a/vmap/client/javascript/externs/moment/locale/uz.js b/src/vitis/client/javascript/externs/moment/locale/uz.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/uz.js
rename to src/vitis/client/javascript/externs/moment/locale/uz.js
diff --git a/vmap/client/javascript/externs/moment/locale/vi.js b/src/vitis/client/javascript/externs/moment/locale/vi.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/vi.js
rename to src/vitis/client/javascript/externs/moment/locale/vi.js
diff --git a/vmap/client/javascript/externs/moment/locale/zh-cn.js b/src/vitis/client/javascript/externs/moment/locale/zh-cn.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/zh-cn.js
rename to src/vitis/client/javascript/externs/moment/locale/zh-cn.js
diff --git a/vmap/client/javascript/externs/moment/locale/zh-tw.js b/src/vitis/client/javascript/externs/moment/locale/zh-tw.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/locale/zh-tw.js
rename to src/vitis/client/javascript/externs/moment/locale/zh-tw.js
diff --git a/vmap/client/javascript/externs/moment/min/locales.js b/src/vitis/client/javascript/externs/moment/min/locales.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/min/locales.js
rename to src/vitis/client/javascript/externs/moment/min/locales.js
diff --git a/vmap/client/javascript/externs/moment/min/locales.min.js b/src/vitis/client/javascript/externs/moment/min/locales.min.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/min/locales.min.js
rename to src/vitis/client/javascript/externs/moment/min/locales.min.js
diff --git a/vmap/client/javascript/externs/moment/min/moment-with-locales.js b/src/vitis/client/javascript/externs/moment/min/moment-with-locales.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/min/moment-with-locales.js
rename to src/vitis/client/javascript/externs/moment/min/moment-with-locales.js
diff --git a/vmap/client/javascript/externs/moment/min/moment-with-locales.min.js b/src/vitis/client/javascript/externs/moment/min/moment-with-locales.min.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/min/moment-with-locales.min.js
rename to src/vitis/client/javascript/externs/moment/min/moment-with-locales.min.js
diff --git a/vmap/client/javascript/externs/moment/min/moment.min.js b/src/vitis/client/javascript/externs/moment/min/moment.min.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/min/moment.min.js
rename to src/vitis/client/javascript/externs/moment/min/moment.min.js
diff --git a/vmap/client/javascript/externs/moment/min/tests.js b/src/vitis/client/javascript/externs/moment/min/tests.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/min/tests.js
rename to src/vitis/client/javascript/externs/moment/min/tests.js
diff --git a/vmap/client/javascript/externs/moment/moment.min.js b/src/vitis/client/javascript/externs/moment/moment.min.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/moment.min.js
rename to src/vitis/client/javascript/externs/moment/moment.min.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/create/check-overflow.js b/src/vitis/client/javascript/externs/moment/src/lib/create/check-overflow.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/create/check-overflow.js
rename to src/vitis/client/javascript/externs/moment/src/lib/create/check-overflow.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/create/date-from-array.js b/src/vitis/client/javascript/externs/moment/src/lib/create/date-from-array.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/create/date-from-array.js
rename to src/vitis/client/javascript/externs/moment/src/lib/create/date-from-array.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/create/from-anything.js b/src/vitis/client/javascript/externs/moment/src/lib/create/from-anything.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/create/from-anything.js
rename to src/vitis/client/javascript/externs/moment/src/lib/create/from-anything.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/create/from-array.js b/src/vitis/client/javascript/externs/moment/src/lib/create/from-array.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/create/from-array.js
rename to src/vitis/client/javascript/externs/moment/src/lib/create/from-array.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/create/from-object.js b/src/vitis/client/javascript/externs/moment/src/lib/create/from-object.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/create/from-object.js
rename to src/vitis/client/javascript/externs/moment/src/lib/create/from-object.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/create/from-string-and-array.js b/src/vitis/client/javascript/externs/moment/src/lib/create/from-string-and-array.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/create/from-string-and-array.js
rename to src/vitis/client/javascript/externs/moment/src/lib/create/from-string-and-array.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/create/from-string-and-format.js b/src/vitis/client/javascript/externs/moment/src/lib/create/from-string-and-format.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/create/from-string-and-format.js
rename to src/vitis/client/javascript/externs/moment/src/lib/create/from-string-and-format.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/create/from-string.js b/src/vitis/client/javascript/externs/moment/src/lib/create/from-string.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/create/from-string.js
rename to src/vitis/client/javascript/externs/moment/src/lib/create/from-string.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/create/local.js b/src/vitis/client/javascript/externs/moment/src/lib/create/local.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/create/local.js
rename to src/vitis/client/javascript/externs/moment/src/lib/create/local.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/create/parsing-flags.js b/src/vitis/client/javascript/externs/moment/src/lib/create/parsing-flags.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/create/parsing-flags.js
rename to src/vitis/client/javascript/externs/moment/src/lib/create/parsing-flags.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/create/utc.js b/src/vitis/client/javascript/externs/moment/src/lib/create/utc.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/create/utc.js
rename to src/vitis/client/javascript/externs/moment/src/lib/create/utc.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/create/valid.js b/src/vitis/client/javascript/externs/moment/src/lib/create/valid.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/create/valid.js
rename to src/vitis/client/javascript/externs/moment/src/lib/create/valid.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/duration/abs.js b/src/vitis/client/javascript/externs/moment/src/lib/duration/abs.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/duration/abs.js
rename to src/vitis/client/javascript/externs/moment/src/lib/duration/abs.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/duration/add-subtract.js b/src/vitis/client/javascript/externs/moment/src/lib/duration/add-subtract.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/duration/add-subtract.js
rename to src/vitis/client/javascript/externs/moment/src/lib/duration/add-subtract.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/duration/as.js b/src/vitis/client/javascript/externs/moment/src/lib/duration/as.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/duration/as.js
rename to src/vitis/client/javascript/externs/moment/src/lib/duration/as.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/duration/bubble.js b/src/vitis/client/javascript/externs/moment/src/lib/duration/bubble.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/duration/bubble.js
rename to src/vitis/client/javascript/externs/moment/src/lib/duration/bubble.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/duration/constructor.js b/src/vitis/client/javascript/externs/moment/src/lib/duration/constructor.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/duration/constructor.js
rename to src/vitis/client/javascript/externs/moment/src/lib/duration/constructor.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/duration/create.js b/src/vitis/client/javascript/externs/moment/src/lib/duration/create.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/duration/create.js
rename to src/vitis/client/javascript/externs/moment/src/lib/duration/create.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/duration/duration.js b/src/vitis/client/javascript/externs/moment/src/lib/duration/duration.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/duration/duration.js
rename to src/vitis/client/javascript/externs/moment/src/lib/duration/duration.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/duration/get.js b/src/vitis/client/javascript/externs/moment/src/lib/duration/get.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/duration/get.js
rename to src/vitis/client/javascript/externs/moment/src/lib/duration/get.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/duration/humanize.js b/src/vitis/client/javascript/externs/moment/src/lib/duration/humanize.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/duration/humanize.js
rename to src/vitis/client/javascript/externs/moment/src/lib/duration/humanize.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/duration/iso-string.js b/src/vitis/client/javascript/externs/moment/src/lib/duration/iso-string.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/duration/iso-string.js
rename to src/vitis/client/javascript/externs/moment/src/lib/duration/iso-string.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/duration/prototype.js b/src/vitis/client/javascript/externs/moment/src/lib/duration/prototype.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/duration/prototype.js
rename to src/vitis/client/javascript/externs/moment/src/lib/duration/prototype.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/format/format.js b/src/vitis/client/javascript/externs/moment/src/lib/format/format.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/format/format.js
rename to src/vitis/client/javascript/externs/moment/src/lib/format/format.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/locale/calendar.js b/src/vitis/client/javascript/externs/moment/src/lib/locale/calendar.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/locale/calendar.js
rename to src/vitis/client/javascript/externs/moment/src/lib/locale/calendar.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/locale/constructor.js b/src/vitis/client/javascript/externs/moment/src/lib/locale/constructor.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/locale/constructor.js
rename to src/vitis/client/javascript/externs/moment/src/lib/locale/constructor.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/locale/en.js b/src/vitis/client/javascript/externs/moment/src/lib/locale/en.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/locale/en.js
rename to src/vitis/client/javascript/externs/moment/src/lib/locale/en.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/locale/formats.js b/src/vitis/client/javascript/externs/moment/src/lib/locale/formats.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/locale/formats.js
rename to src/vitis/client/javascript/externs/moment/src/lib/locale/formats.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/locale/invalid.js b/src/vitis/client/javascript/externs/moment/src/lib/locale/invalid.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/locale/invalid.js
rename to src/vitis/client/javascript/externs/moment/src/lib/locale/invalid.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/locale/lists.js b/src/vitis/client/javascript/externs/moment/src/lib/locale/lists.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/locale/lists.js
rename to src/vitis/client/javascript/externs/moment/src/lib/locale/lists.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/locale/locale.js b/src/vitis/client/javascript/externs/moment/src/lib/locale/locale.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/locale/locale.js
rename to src/vitis/client/javascript/externs/moment/src/lib/locale/locale.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/locale/locales.js b/src/vitis/client/javascript/externs/moment/src/lib/locale/locales.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/locale/locales.js
rename to src/vitis/client/javascript/externs/moment/src/lib/locale/locales.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/locale/ordinal.js b/src/vitis/client/javascript/externs/moment/src/lib/locale/ordinal.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/locale/ordinal.js
rename to src/vitis/client/javascript/externs/moment/src/lib/locale/ordinal.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/locale/pre-post-format.js b/src/vitis/client/javascript/externs/moment/src/lib/locale/pre-post-format.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/locale/pre-post-format.js
rename to src/vitis/client/javascript/externs/moment/src/lib/locale/pre-post-format.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/locale/prototype.js b/src/vitis/client/javascript/externs/moment/src/lib/locale/prototype.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/locale/prototype.js
rename to src/vitis/client/javascript/externs/moment/src/lib/locale/prototype.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/locale/relative.js b/src/vitis/client/javascript/externs/moment/src/lib/locale/relative.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/locale/relative.js
rename to src/vitis/client/javascript/externs/moment/src/lib/locale/relative.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/locale/set.js b/src/vitis/client/javascript/externs/moment/src/lib/locale/set.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/locale/set.js
rename to src/vitis/client/javascript/externs/moment/src/lib/locale/set.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/moment/add-subtract.js b/src/vitis/client/javascript/externs/moment/src/lib/moment/add-subtract.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/moment/add-subtract.js
rename to src/vitis/client/javascript/externs/moment/src/lib/moment/add-subtract.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/moment/calendar.js b/src/vitis/client/javascript/externs/moment/src/lib/moment/calendar.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/moment/calendar.js
rename to src/vitis/client/javascript/externs/moment/src/lib/moment/calendar.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/moment/clone.js b/src/vitis/client/javascript/externs/moment/src/lib/moment/clone.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/moment/clone.js
rename to src/vitis/client/javascript/externs/moment/src/lib/moment/clone.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/moment/compare.js b/src/vitis/client/javascript/externs/moment/src/lib/moment/compare.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/moment/compare.js
rename to src/vitis/client/javascript/externs/moment/src/lib/moment/compare.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/moment/constructor.js b/src/vitis/client/javascript/externs/moment/src/lib/moment/constructor.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/moment/constructor.js
rename to src/vitis/client/javascript/externs/moment/src/lib/moment/constructor.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/moment/creation-data.js b/src/vitis/client/javascript/externs/moment/src/lib/moment/creation-data.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/moment/creation-data.js
rename to src/vitis/client/javascript/externs/moment/src/lib/moment/creation-data.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/moment/diff.js b/src/vitis/client/javascript/externs/moment/src/lib/moment/diff.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/moment/diff.js
rename to src/vitis/client/javascript/externs/moment/src/lib/moment/diff.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/moment/format.js b/src/vitis/client/javascript/externs/moment/src/lib/moment/format.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/moment/format.js
rename to src/vitis/client/javascript/externs/moment/src/lib/moment/format.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/moment/from.js b/src/vitis/client/javascript/externs/moment/src/lib/moment/from.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/moment/from.js
rename to src/vitis/client/javascript/externs/moment/src/lib/moment/from.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/moment/get-set.js b/src/vitis/client/javascript/externs/moment/src/lib/moment/get-set.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/moment/get-set.js
rename to src/vitis/client/javascript/externs/moment/src/lib/moment/get-set.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/moment/locale.js b/src/vitis/client/javascript/externs/moment/src/lib/moment/locale.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/moment/locale.js
rename to src/vitis/client/javascript/externs/moment/src/lib/moment/locale.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/moment/min-max.js b/src/vitis/client/javascript/externs/moment/src/lib/moment/min-max.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/moment/min-max.js
rename to src/vitis/client/javascript/externs/moment/src/lib/moment/min-max.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/moment/moment.js b/src/vitis/client/javascript/externs/moment/src/lib/moment/moment.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/moment/moment.js
rename to src/vitis/client/javascript/externs/moment/src/lib/moment/moment.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/moment/now.js b/src/vitis/client/javascript/externs/moment/src/lib/moment/now.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/moment/now.js
rename to src/vitis/client/javascript/externs/moment/src/lib/moment/now.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/moment/prototype.js b/src/vitis/client/javascript/externs/moment/src/lib/moment/prototype.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/moment/prototype.js
rename to src/vitis/client/javascript/externs/moment/src/lib/moment/prototype.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/moment/start-end-of.js b/src/vitis/client/javascript/externs/moment/src/lib/moment/start-end-of.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/moment/start-end-of.js
rename to src/vitis/client/javascript/externs/moment/src/lib/moment/start-end-of.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/moment/to-type.js b/src/vitis/client/javascript/externs/moment/src/lib/moment/to-type.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/moment/to-type.js
rename to src/vitis/client/javascript/externs/moment/src/lib/moment/to-type.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/moment/to.js b/src/vitis/client/javascript/externs/moment/src/lib/moment/to.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/moment/to.js
rename to src/vitis/client/javascript/externs/moment/src/lib/moment/to.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/moment/valid.js b/src/vitis/client/javascript/externs/moment/src/lib/moment/valid.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/moment/valid.js
rename to src/vitis/client/javascript/externs/moment/src/lib/moment/valid.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/parse/regex.js b/src/vitis/client/javascript/externs/moment/src/lib/parse/regex.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/parse/regex.js
rename to src/vitis/client/javascript/externs/moment/src/lib/parse/regex.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/parse/token.js b/src/vitis/client/javascript/externs/moment/src/lib/parse/token.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/parse/token.js
rename to src/vitis/client/javascript/externs/moment/src/lib/parse/token.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/units/aliases.js b/src/vitis/client/javascript/externs/moment/src/lib/units/aliases.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/units/aliases.js
rename to src/vitis/client/javascript/externs/moment/src/lib/units/aliases.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/units/constants.js b/src/vitis/client/javascript/externs/moment/src/lib/units/constants.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/units/constants.js
rename to src/vitis/client/javascript/externs/moment/src/lib/units/constants.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/units/day-of-month.js b/src/vitis/client/javascript/externs/moment/src/lib/units/day-of-month.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/units/day-of-month.js
rename to src/vitis/client/javascript/externs/moment/src/lib/units/day-of-month.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/units/day-of-week.js b/src/vitis/client/javascript/externs/moment/src/lib/units/day-of-week.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/units/day-of-week.js
rename to src/vitis/client/javascript/externs/moment/src/lib/units/day-of-week.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/units/day-of-year.js b/src/vitis/client/javascript/externs/moment/src/lib/units/day-of-year.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/units/day-of-year.js
rename to src/vitis/client/javascript/externs/moment/src/lib/units/day-of-year.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/units/hour.js b/src/vitis/client/javascript/externs/moment/src/lib/units/hour.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/units/hour.js
rename to src/vitis/client/javascript/externs/moment/src/lib/units/hour.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/units/millisecond.js b/src/vitis/client/javascript/externs/moment/src/lib/units/millisecond.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/units/millisecond.js
rename to src/vitis/client/javascript/externs/moment/src/lib/units/millisecond.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/units/minute.js b/src/vitis/client/javascript/externs/moment/src/lib/units/minute.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/units/minute.js
rename to src/vitis/client/javascript/externs/moment/src/lib/units/minute.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/units/month.js b/src/vitis/client/javascript/externs/moment/src/lib/units/month.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/units/month.js
rename to src/vitis/client/javascript/externs/moment/src/lib/units/month.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/units/offset.js b/src/vitis/client/javascript/externs/moment/src/lib/units/offset.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/units/offset.js
rename to src/vitis/client/javascript/externs/moment/src/lib/units/offset.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/units/quarter.js b/src/vitis/client/javascript/externs/moment/src/lib/units/quarter.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/units/quarter.js
rename to src/vitis/client/javascript/externs/moment/src/lib/units/quarter.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/units/second.js b/src/vitis/client/javascript/externs/moment/src/lib/units/second.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/units/second.js
rename to src/vitis/client/javascript/externs/moment/src/lib/units/second.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/units/timestamp.js b/src/vitis/client/javascript/externs/moment/src/lib/units/timestamp.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/units/timestamp.js
rename to src/vitis/client/javascript/externs/moment/src/lib/units/timestamp.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/units/timezone.js b/src/vitis/client/javascript/externs/moment/src/lib/units/timezone.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/units/timezone.js
rename to src/vitis/client/javascript/externs/moment/src/lib/units/timezone.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/units/units.js b/src/vitis/client/javascript/externs/moment/src/lib/units/units.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/units/units.js
rename to src/vitis/client/javascript/externs/moment/src/lib/units/units.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/units/week-calendar-utils.js b/src/vitis/client/javascript/externs/moment/src/lib/units/week-calendar-utils.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/units/week-calendar-utils.js
rename to src/vitis/client/javascript/externs/moment/src/lib/units/week-calendar-utils.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/units/week-year.js b/src/vitis/client/javascript/externs/moment/src/lib/units/week-year.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/units/week-year.js
rename to src/vitis/client/javascript/externs/moment/src/lib/units/week-year.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/units/week.js b/src/vitis/client/javascript/externs/moment/src/lib/units/week.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/units/week.js
rename to src/vitis/client/javascript/externs/moment/src/lib/units/week.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/units/year.js b/src/vitis/client/javascript/externs/moment/src/lib/units/year.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/units/year.js
rename to src/vitis/client/javascript/externs/moment/src/lib/units/year.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/utils/abs-ceil.js b/src/vitis/client/javascript/externs/moment/src/lib/utils/abs-ceil.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/utils/abs-ceil.js
rename to src/vitis/client/javascript/externs/moment/src/lib/utils/abs-ceil.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/utils/abs-floor.js b/src/vitis/client/javascript/externs/moment/src/lib/utils/abs-floor.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/utils/abs-floor.js
rename to src/vitis/client/javascript/externs/moment/src/lib/utils/abs-floor.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/utils/compare-arrays.js b/src/vitis/client/javascript/externs/moment/src/lib/utils/compare-arrays.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/utils/compare-arrays.js
rename to src/vitis/client/javascript/externs/moment/src/lib/utils/compare-arrays.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/utils/defaults.js b/src/vitis/client/javascript/externs/moment/src/lib/utils/defaults.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/utils/defaults.js
rename to src/vitis/client/javascript/externs/moment/src/lib/utils/defaults.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/utils/deprecate.js b/src/vitis/client/javascript/externs/moment/src/lib/utils/deprecate.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/utils/deprecate.js
rename to src/vitis/client/javascript/externs/moment/src/lib/utils/deprecate.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/utils/extend.js b/src/vitis/client/javascript/externs/moment/src/lib/utils/extend.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/utils/extend.js
rename to src/vitis/client/javascript/externs/moment/src/lib/utils/extend.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/utils/has-own-prop.js b/src/vitis/client/javascript/externs/moment/src/lib/utils/has-own-prop.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/utils/has-own-prop.js
rename to src/vitis/client/javascript/externs/moment/src/lib/utils/has-own-prop.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/utils/hooks.js b/src/vitis/client/javascript/externs/moment/src/lib/utils/hooks.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/utils/hooks.js
rename to src/vitis/client/javascript/externs/moment/src/lib/utils/hooks.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/utils/is-array.js b/src/vitis/client/javascript/externs/moment/src/lib/utils/is-array.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/utils/is-array.js
rename to src/vitis/client/javascript/externs/moment/src/lib/utils/is-array.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/utils/is-date.js b/src/vitis/client/javascript/externs/moment/src/lib/utils/is-date.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/utils/is-date.js
rename to src/vitis/client/javascript/externs/moment/src/lib/utils/is-date.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/utils/is-function.js b/src/vitis/client/javascript/externs/moment/src/lib/utils/is-function.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/utils/is-function.js
rename to src/vitis/client/javascript/externs/moment/src/lib/utils/is-function.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/utils/is-undefined.js b/src/vitis/client/javascript/externs/moment/src/lib/utils/is-undefined.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/utils/is-undefined.js
rename to src/vitis/client/javascript/externs/moment/src/lib/utils/is-undefined.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/utils/map.js b/src/vitis/client/javascript/externs/moment/src/lib/utils/map.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/utils/map.js
rename to src/vitis/client/javascript/externs/moment/src/lib/utils/map.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/utils/to-int.js b/src/vitis/client/javascript/externs/moment/src/lib/utils/to-int.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/utils/to-int.js
rename to src/vitis/client/javascript/externs/moment/src/lib/utils/to-int.js
diff --git a/vmap/client/javascript/externs/moment/src/lib/utils/zero-fill.js b/src/vitis/client/javascript/externs/moment/src/lib/utils/zero-fill.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/lib/utils/zero-fill.js
rename to src/vitis/client/javascript/externs/moment/src/lib/utils/zero-fill.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/af.js b/src/vitis/client/javascript/externs/moment/src/locale/af.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/af.js
rename to src/vitis/client/javascript/externs/moment/src/locale/af.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/ar-ma.js b/src/vitis/client/javascript/externs/moment/src/locale/ar-ma.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/ar-ma.js
rename to src/vitis/client/javascript/externs/moment/src/locale/ar-ma.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/ar-sa.js b/src/vitis/client/javascript/externs/moment/src/locale/ar-sa.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/ar-sa.js
rename to src/vitis/client/javascript/externs/moment/src/locale/ar-sa.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/ar-tn.js b/src/vitis/client/javascript/externs/moment/src/locale/ar-tn.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/ar-tn.js
rename to src/vitis/client/javascript/externs/moment/src/locale/ar-tn.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/ar.js b/src/vitis/client/javascript/externs/moment/src/locale/ar.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/ar.js
rename to src/vitis/client/javascript/externs/moment/src/locale/ar.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/az.js b/src/vitis/client/javascript/externs/moment/src/locale/az.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/az.js
rename to src/vitis/client/javascript/externs/moment/src/locale/az.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/be.js b/src/vitis/client/javascript/externs/moment/src/locale/be.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/be.js
rename to src/vitis/client/javascript/externs/moment/src/locale/be.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/bg.js b/src/vitis/client/javascript/externs/moment/src/locale/bg.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/bg.js
rename to src/vitis/client/javascript/externs/moment/src/locale/bg.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/bn.js b/src/vitis/client/javascript/externs/moment/src/locale/bn.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/bn.js
rename to src/vitis/client/javascript/externs/moment/src/locale/bn.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/bo.js b/src/vitis/client/javascript/externs/moment/src/locale/bo.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/bo.js
rename to src/vitis/client/javascript/externs/moment/src/locale/bo.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/br.js b/src/vitis/client/javascript/externs/moment/src/locale/br.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/br.js
rename to src/vitis/client/javascript/externs/moment/src/locale/br.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/bs.js b/src/vitis/client/javascript/externs/moment/src/locale/bs.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/bs.js
rename to src/vitis/client/javascript/externs/moment/src/locale/bs.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/ca.js b/src/vitis/client/javascript/externs/moment/src/locale/ca.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/ca.js
rename to src/vitis/client/javascript/externs/moment/src/locale/ca.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/cs.js b/src/vitis/client/javascript/externs/moment/src/locale/cs.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/cs.js
rename to src/vitis/client/javascript/externs/moment/src/locale/cs.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/cv.js b/src/vitis/client/javascript/externs/moment/src/locale/cv.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/cv.js
rename to src/vitis/client/javascript/externs/moment/src/locale/cv.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/cy.js b/src/vitis/client/javascript/externs/moment/src/locale/cy.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/cy.js
rename to src/vitis/client/javascript/externs/moment/src/locale/cy.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/da.js b/src/vitis/client/javascript/externs/moment/src/locale/da.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/da.js
rename to src/vitis/client/javascript/externs/moment/src/locale/da.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/de-at.js b/src/vitis/client/javascript/externs/moment/src/locale/de-at.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/de-at.js
rename to src/vitis/client/javascript/externs/moment/src/locale/de-at.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/de.js b/src/vitis/client/javascript/externs/moment/src/locale/de.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/de.js
rename to src/vitis/client/javascript/externs/moment/src/locale/de.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/dv.js b/src/vitis/client/javascript/externs/moment/src/locale/dv.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/dv.js
rename to src/vitis/client/javascript/externs/moment/src/locale/dv.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/el.js b/src/vitis/client/javascript/externs/moment/src/locale/el.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/el.js
rename to src/vitis/client/javascript/externs/moment/src/locale/el.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/en-au.js b/src/vitis/client/javascript/externs/moment/src/locale/en-au.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/en-au.js
rename to src/vitis/client/javascript/externs/moment/src/locale/en-au.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/en-ca.js b/src/vitis/client/javascript/externs/moment/src/locale/en-ca.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/en-ca.js
rename to src/vitis/client/javascript/externs/moment/src/locale/en-ca.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/en-gb.js b/src/vitis/client/javascript/externs/moment/src/locale/en-gb.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/en-gb.js
rename to src/vitis/client/javascript/externs/moment/src/locale/en-gb.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/en-ie.js b/src/vitis/client/javascript/externs/moment/src/locale/en-ie.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/en-ie.js
rename to src/vitis/client/javascript/externs/moment/src/locale/en-ie.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/en-nz.js b/src/vitis/client/javascript/externs/moment/src/locale/en-nz.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/en-nz.js
rename to src/vitis/client/javascript/externs/moment/src/locale/en-nz.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/eo.js b/src/vitis/client/javascript/externs/moment/src/locale/eo.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/eo.js
rename to src/vitis/client/javascript/externs/moment/src/locale/eo.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/es.js b/src/vitis/client/javascript/externs/moment/src/locale/es.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/es.js
rename to src/vitis/client/javascript/externs/moment/src/locale/es.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/et.js b/src/vitis/client/javascript/externs/moment/src/locale/et.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/et.js
rename to src/vitis/client/javascript/externs/moment/src/locale/et.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/eu.js b/src/vitis/client/javascript/externs/moment/src/locale/eu.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/eu.js
rename to src/vitis/client/javascript/externs/moment/src/locale/eu.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/fa.js b/src/vitis/client/javascript/externs/moment/src/locale/fa.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/fa.js
rename to src/vitis/client/javascript/externs/moment/src/locale/fa.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/fi.js b/src/vitis/client/javascript/externs/moment/src/locale/fi.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/fi.js
rename to src/vitis/client/javascript/externs/moment/src/locale/fi.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/fo.js b/src/vitis/client/javascript/externs/moment/src/locale/fo.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/fo.js
rename to src/vitis/client/javascript/externs/moment/src/locale/fo.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/fr-ca.js b/src/vitis/client/javascript/externs/moment/src/locale/fr-ca.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/fr-ca.js
rename to src/vitis/client/javascript/externs/moment/src/locale/fr-ca.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/fr-ch.js b/src/vitis/client/javascript/externs/moment/src/locale/fr-ch.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/fr-ch.js
rename to src/vitis/client/javascript/externs/moment/src/locale/fr-ch.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/fr.js b/src/vitis/client/javascript/externs/moment/src/locale/fr.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/fr.js
rename to src/vitis/client/javascript/externs/moment/src/locale/fr.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/fy.js b/src/vitis/client/javascript/externs/moment/src/locale/fy.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/fy.js
rename to src/vitis/client/javascript/externs/moment/src/locale/fy.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/gd.js b/src/vitis/client/javascript/externs/moment/src/locale/gd.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/gd.js
rename to src/vitis/client/javascript/externs/moment/src/locale/gd.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/gl.js b/src/vitis/client/javascript/externs/moment/src/locale/gl.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/gl.js
rename to src/vitis/client/javascript/externs/moment/src/locale/gl.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/he.js b/src/vitis/client/javascript/externs/moment/src/locale/he.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/he.js
rename to src/vitis/client/javascript/externs/moment/src/locale/he.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/hi.js b/src/vitis/client/javascript/externs/moment/src/locale/hi.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/hi.js
rename to src/vitis/client/javascript/externs/moment/src/locale/hi.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/hr.js b/src/vitis/client/javascript/externs/moment/src/locale/hr.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/hr.js
rename to src/vitis/client/javascript/externs/moment/src/locale/hr.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/hu.js b/src/vitis/client/javascript/externs/moment/src/locale/hu.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/hu.js
rename to src/vitis/client/javascript/externs/moment/src/locale/hu.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/hy-am.js b/src/vitis/client/javascript/externs/moment/src/locale/hy-am.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/hy-am.js
rename to src/vitis/client/javascript/externs/moment/src/locale/hy-am.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/id.js b/src/vitis/client/javascript/externs/moment/src/locale/id.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/id.js
rename to src/vitis/client/javascript/externs/moment/src/locale/id.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/is.js b/src/vitis/client/javascript/externs/moment/src/locale/is.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/is.js
rename to src/vitis/client/javascript/externs/moment/src/locale/is.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/it.js b/src/vitis/client/javascript/externs/moment/src/locale/it.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/it.js
rename to src/vitis/client/javascript/externs/moment/src/locale/it.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/ja.js b/src/vitis/client/javascript/externs/moment/src/locale/ja.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/ja.js
rename to src/vitis/client/javascript/externs/moment/src/locale/ja.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/jv.js b/src/vitis/client/javascript/externs/moment/src/locale/jv.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/jv.js
rename to src/vitis/client/javascript/externs/moment/src/locale/jv.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/ka.js b/src/vitis/client/javascript/externs/moment/src/locale/ka.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/ka.js
rename to src/vitis/client/javascript/externs/moment/src/locale/ka.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/kk.js b/src/vitis/client/javascript/externs/moment/src/locale/kk.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/kk.js
rename to src/vitis/client/javascript/externs/moment/src/locale/kk.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/km.js b/src/vitis/client/javascript/externs/moment/src/locale/km.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/km.js
rename to src/vitis/client/javascript/externs/moment/src/locale/km.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/ko.js b/src/vitis/client/javascript/externs/moment/src/locale/ko.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/ko.js
rename to src/vitis/client/javascript/externs/moment/src/locale/ko.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/lb.js b/src/vitis/client/javascript/externs/moment/src/locale/lb.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/lb.js
rename to src/vitis/client/javascript/externs/moment/src/locale/lb.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/lo.js b/src/vitis/client/javascript/externs/moment/src/locale/lo.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/lo.js
rename to src/vitis/client/javascript/externs/moment/src/locale/lo.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/lt.js b/src/vitis/client/javascript/externs/moment/src/locale/lt.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/lt.js
rename to src/vitis/client/javascript/externs/moment/src/locale/lt.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/lv.js b/src/vitis/client/javascript/externs/moment/src/locale/lv.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/lv.js
rename to src/vitis/client/javascript/externs/moment/src/locale/lv.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/me.js b/src/vitis/client/javascript/externs/moment/src/locale/me.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/me.js
rename to src/vitis/client/javascript/externs/moment/src/locale/me.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/mk.js b/src/vitis/client/javascript/externs/moment/src/locale/mk.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/mk.js
rename to src/vitis/client/javascript/externs/moment/src/locale/mk.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/ml.js b/src/vitis/client/javascript/externs/moment/src/locale/ml.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/ml.js
rename to src/vitis/client/javascript/externs/moment/src/locale/ml.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/mr.js b/src/vitis/client/javascript/externs/moment/src/locale/mr.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/mr.js
rename to src/vitis/client/javascript/externs/moment/src/locale/mr.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/ms-my.js b/src/vitis/client/javascript/externs/moment/src/locale/ms-my.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/ms-my.js
rename to src/vitis/client/javascript/externs/moment/src/locale/ms-my.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/ms.js b/src/vitis/client/javascript/externs/moment/src/locale/ms.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/ms.js
rename to src/vitis/client/javascript/externs/moment/src/locale/ms.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/my.js b/src/vitis/client/javascript/externs/moment/src/locale/my.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/my.js
rename to src/vitis/client/javascript/externs/moment/src/locale/my.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/nb.js b/src/vitis/client/javascript/externs/moment/src/locale/nb.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/nb.js
rename to src/vitis/client/javascript/externs/moment/src/locale/nb.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/ne.js b/src/vitis/client/javascript/externs/moment/src/locale/ne.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/ne.js
rename to src/vitis/client/javascript/externs/moment/src/locale/ne.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/nl.js b/src/vitis/client/javascript/externs/moment/src/locale/nl.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/nl.js
rename to src/vitis/client/javascript/externs/moment/src/locale/nl.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/nn.js b/src/vitis/client/javascript/externs/moment/src/locale/nn.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/nn.js
rename to src/vitis/client/javascript/externs/moment/src/locale/nn.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/pl.js b/src/vitis/client/javascript/externs/moment/src/locale/pl.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/pl.js
rename to src/vitis/client/javascript/externs/moment/src/locale/pl.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/pt-br.js b/src/vitis/client/javascript/externs/moment/src/locale/pt-br.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/pt-br.js
rename to src/vitis/client/javascript/externs/moment/src/locale/pt-br.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/pt.js b/src/vitis/client/javascript/externs/moment/src/locale/pt.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/pt.js
rename to src/vitis/client/javascript/externs/moment/src/locale/pt.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/ro.js b/src/vitis/client/javascript/externs/moment/src/locale/ro.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/ro.js
rename to src/vitis/client/javascript/externs/moment/src/locale/ro.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/ru.js b/src/vitis/client/javascript/externs/moment/src/locale/ru.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/ru.js
rename to src/vitis/client/javascript/externs/moment/src/locale/ru.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/se.js b/src/vitis/client/javascript/externs/moment/src/locale/se.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/se.js
rename to src/vitis/client/javascript/externs/moment/src/locale/se.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/si.js b/src/vitis/client/javascript/externs/moment/src/locale/si.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/si.js
rename to src/vitis/client/javascript/externs/moment/src/locale/si.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/sk.js b/src/vitis/client/javascript/externs/moment/src/locale/sk.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/sk.js
rename to src/vitis/client/javascript/externs/moment/src/locale/sk.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/sl.js b/src/vitis/client/javascript/externs/moment/src/locale/sl.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/sl.js
rename to src/vitis/client/javascript/externs/moment/src/locale/sl.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/sq.js b/src/vitis/client/javascript/externs/moment/src/locale/sq.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/sq.js
rename to src/vitis/client/javascript/externs/moment/src/locale/sq.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/sr-cyrl.js b/src/vitis/client/javascript/externs/moment/src/locale/sr-cyrl.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/sr-cyrl.js
rename to src/vitis/client/javascript/externs/moment/src/locale/sr-cyrl.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/sr.js b/src/vitis/client/javascript/externs/moment/src/locale/sr.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/sr.js
rename to src/vitis/client/javascript/externs/moment/src/locale/sr.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/sv.js b/src/vitis/client/javascript/externs/moment/src/locale/sv.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/sv.js
rename to src/vitis/client/javascript/externs/moment/src/locale/sv.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/sw.js b/src/vitis/client/javascript/externs/moment/src/locale/sw.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/sw.js
rename to src/vitis/client/javascript/externs/moment/src/locale/sw.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/ta.js b/src/vitis/client/javascript/externs/moment/src/locale/ta.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/ta.js
rename to src/vitis/client/javascript/externs/moment/src/locale/ta.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/te.js b/src/vitis/client/javascript/externs/moment/src/locale/te.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/te.js
rename to src/vitis/client/javascript/externs/moment/src/locale/te.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/th.js b/src/vitis/client/javascript/externs/moment/src/locale/th.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/th.js
rename to src/vitis/client/javascript/externs/moment/src/locale/th.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/tl-ph.js b/src/vitis/client/javascript/externs/moment/src/locale/tl-ph.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/tl-ph.js
rename to src/vitis/client/javascript/externs/moment/src/locale/tl-ph.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/tlh.js b/src/vitis/client/javascript/externs/moment/src/locale/tlh.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/tlh.js
rename to src/vitis/client/javascript/externs/moment/src/locale/tlh.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/tr.js b/src/vitis/client/javascript/externs/moment/src/locale/tr.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/tr.js
rename to src/vitis/client/javascript/externs/moment/src/locale/tr.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/tzl.js b/src/vitis/client/javascript/externs/moment/src/locale/tzl.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/tzl.js
rename to src/vitis/client/javascript/externs/moment/src/locale/tzl.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/tzm-latn.js b/src/vitis/client/javascript/externs/moment/src/locale/tzm-latn.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/tzm-latn.js
rename to src/vitis/client/javascript/externs/moment/src/locale/tzm-latn.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/tzm.js b/src/vitis/client/javascript/externs/moment/src/locale/tzm.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/tzm.js
rename to src/vitis/client/javascript/externs/moment/src/locale/tzm.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/uk.js b/src/vitis/client/javascript/externs/moment/src/locale/uk.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/uk.js
rename to src/vitis/client/javascript/externs/moment/src/locale/uk.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/uz.js b/src/vitis/client/javascript/externs/moment/src/locale/uz.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/uz.js
rename to src/vitis/client/javascript/externs/moment/src/locale/uz.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/vi.js b/src/vitis/client/javascript/externs/moment/src/locale/vi.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/vi.js
rename to src/vitis/client/javascript/externs/moment/src/locale/vi.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/zh-cn.js b/src/vitis/client/javascript/externs/moment/src/locale/zh-cn.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/zh-cn.js
rename to src/vitis/client/javascript/externs/moment/src/locale/zh-cn.js
diff --git a/vmap/client/javascript/externs/moment/src/locale/zh-tw.js b/src/vitis/client/javascript/externs/moment/src/locale/zh-tw.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/locale/zh-tw.js
rename to src/vitis/client/javascript/externs/moment/src/locale/zh-tw.js
diff --git a/vmap/client/javascript/externs/moment/src/moment.js b/src/vitis/client/javascript/externs/moment/src/moment.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/src/moment.js
rename to src/vitis/client/javascript/externs/moment/src/moment.js
diff --git a/vmap/client/javascript/externs/moment/templates/amd-named.js b/src/vitis/client/javascript/externs/moment/templates/amd-named.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/templates/amd-named.js
rename to src/vitis/client/javascript/externs/moment/templates/amd-named.js
diff --git a/vmap/client/javascript/externs/moment/templates/amd.js b/src/vitis/client/javascript/externs/moment/templates/amd.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/templates/amd.js
rename to src/vitis/client/javascript/externs/moment/templates/amd.js
diff --git a/vmap/client/javascript/externs/moment/templates/default.js b/src/vitis/client/javascript/externs/moment/templates/default.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/templates/default.js
rename to src/vitis/client/javascript/externs/moment/templates/default.js
diff --git a/vmap/client/javascript/externs/moment/templates/globals.js b/src/vitis/client/javascript/externs/moment/templates/globals.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/templates/globals.js
rename to src/vitis/client/javascript/externs/moment/templates/globals.js
diff --git a/vmap/client/javascript/externs/moment/templates/locale-header.js b/src/vitis/client/javascript/externs/moment/templates/locale-header.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/templates/locale-header.js
rename to src/vitis/client/javascript/externs/moment/templates/locale-header.js
diff --git a/vmap/client/javascript/externs/moment/templates/test-header.js b/src/vitis/client/javascript/externs/moment/templates/test-header.js
similarity index 100%
rename from vmap/client/javascript/externs/moment/templates/test-header.js
rename to src/vitis/client/javascript/externs/moment/templates/test-header.js
diff --git a/vmap/client/javascript/externs/openLayers/licenses/APACHE-2.0.txt b/src/vitis/client/javascript/externs/openLayers/licenses/APACHE-2.0.txt
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/licenses/APACHE-2.0.txt
rename to src/vitis/client/javascript/externs/openLayers/licenses/APACHE-2.0.txt
diff --git a/vmap/client/javascript/externs/openLayers/licenses/BSD-LICENSE.txt b/src/vitis/client/javascript/externs/openLayers/licenses/BSD-LICENSE.txt
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/licenses/BSD-LICENSE.txt
rename to src/vitis/client/javascript/externs/openLayers/licenses/BSD-LICENSE.txt
diff --git a/vmap/client/javascript/externs/openLayers/licenses/MIT-LICENSE.txt b/src/vitis/client/javascript/externs/openLayers/licenses/MIT-LICENSE.txt
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/licenses/MIT-LICENSE.txt
rename to src/vitis/client/javascript/externs/openLayers/licenses/MIT-LICENSE.txt
diff --git a/vmap/client/javascript/externs/openLayers/ol.ext/pbf.js b/src/vitis/client/javascript/externs/openLayers/ol.ext/pbf.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol.ext/pbf.js
rename to src/vitis/client/javascript/externs/openLayers/ol.ext/pbf.js
diff --git a/vmap/client/javascript/externs/openLayers/ol.ext/pixelworks.js b/src/vitis/client/javascript/externs/openLayers/ol.ext/pixelworks.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol.ext/pixelworks.js
rename to src/vitis/client/javascript/externs/openLayers/ol.ext/pixelworks.js
diff --git a/vmap/client/javascript/externs/openLayers/ol.ext/rbush.js b/src/vitis/client/javascript/externs/openLayers/ol.ext/rbush.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol.ext/rbush.js
rename to src/vitis/client/javascript/externs/openLayers/ol.ext/rbush.js
diff --git a/vmap/client/javascript/externs/openLayers/ol.ext/vectortile.js b/src/vitis/client/javascript/externs/openLayers/ol.ext/vectortile.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol.ext/vectortile.js
rename to src/vitis/client/javascript/externs/openLayers/ol.ext/vectortile.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/array.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/array.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/array.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/array.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/assertionerror.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/assertionerror.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/assertionerror.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/assertionerror.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/asserts.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/asserts.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/asserts.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/asserts.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/attribution.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/attribution.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/attribution.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/attribution.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/canvasmap.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/canvasmap.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/canvasmap.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/canvasmap.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/centerconstraint.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/centerconstraint.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/centerconstraint.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/centerconstraint.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/collection.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/collection.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/collection.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/collection.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/collectioneventtype.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/collectioneventtype.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/collectioneventtype.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/collectioneventtype.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/color.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/color.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/color.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/color.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/color.jsdoc b/src/vitis/client/javascript/externs/openLayers/ol/ol/color.jsdoc
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/color.jsdoc
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/color.jsdoc
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/colorlike.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/colorlike.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/colorlike.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/colorlike.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/colorlike.jsdoc b/src/vitis/client/javascript/externs/openLayers/ol/ol/colorlike.jsdoc
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/colorlike.jsdoc
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/colorlike.jsdoc
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/control.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/control.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/control.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/control.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/control/attribution.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/control/attribution.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/control/attribution.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/control/attribution.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/control/control.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/control/control.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/control/control.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/control/control.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/control/fullscreen.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/control/fullscreen.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/control/fullscreen.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/control/fullscreen.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/control/index.jsdoc b/src/vitis/client/javascript/externs/openLayers/ol/ol/control/index.jsdoc
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/control/index.jsdoc
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/control/index.jsdoc
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/control/mouseposition.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/control/mouseposition.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/control/mouseposition.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/control/mouseposition.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/control/overviewmap.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/control/overviewmap.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/control/overviewmap.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/control/overviewmap.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/control/rotate.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/control/rotate.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/control/rotate.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/control/rotate.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/control/scaleline.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/control/scaleline.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/control/scaleline.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/control/scaleline.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/control/scalelineunits.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/control/scalelineunits.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/control/scalelineunits.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/control/scalelineunits.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/control/zoom.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/control/zoom.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/control/zoom.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/control/zoom.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/control/zoomslider.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/control/zoomslider.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/control/zoomslider.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/control/zoomslider.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/control/zoomtoextent.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/control/zoomtoextent.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/control/zoomtoextent.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/control/zoomtoextent.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/coordinate.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/coordinate.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/coordinate.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/coordinate.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/coordinate.jsdoc b/src/vitis/client/javascript/externs/openLayers/ol/ol/coordinate.jsdoc
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/coordinate.jsdoc
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/coordinate.jsdoc
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/css.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/css.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/css.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/css.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/deviceorientation.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/deviceorientation.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/deviceorientation.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/deviceorientation.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/disposable.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/disposable.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/disposable.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/disposable.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/dom.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/dom.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/dom.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/dom.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/easing.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/easing.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/easing.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/easing.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/easing.jsdoc b/src/vitis/client/javascript/externs/openLayers/ol/ol/easing.jsdoc
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/easing.jsdoc
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/easing.jsdoc
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/events.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/events.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/events.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/events.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/events/condition.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/events/condition.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/events/condition.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/events/condition.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/events/condition.jsdoc b/src/vitis/client/javascript/externs/openLayers/ol/ol/events/condition.jsdoc
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/events/condition.jsdoc
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/events/condition.jsdoc
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/events/event.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/events/event.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/events/event.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/events/event.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/events/eventtarget.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/events/eventtarget.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/events/eventtarget.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/events/eventtarget.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/events/eventtype.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/events/eventtype.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/events/eventtype.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/events/eventtype.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/events/keycode.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/events/keycode.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/events/keycode.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/events/keycode.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/extent.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/extent.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/extent.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/extent.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/extent.jsdoc b/src/vitis/client/javascript/externs/openLayers/ol/ol/extent.jsdoc
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/extent.jsdoc
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/extent.jsdoc
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/extent/corner.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/extent/corner.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/extent/corner.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/extent/corner.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/extent/relationship.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/extent/relationship.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/extent/relationship.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/extent/relationship.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/feature.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/feature.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/feature.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/feature.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/featureloader.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/featureloader.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/featureloader.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/featureloader.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/featureloader.jsdoc b/src/vitis/client/javascript/externs/openLayers/ol/ol/featureloader.jsdoc
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/featureloader.jsdoc
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/featureloader.jsdoc
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/format/esrijson.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/format/esrijson.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/format/esrijson.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/format/esrijson.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/format/feature.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/format/feature.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/format/feature.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/format/feature.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/format/filter.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/format/filter.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/format/filter.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/format/filter.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/format/filter/and.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/format/filter/and.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/format/filter/and.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/format/filter/and.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/format/filter/bbox.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/format/filter/bbox.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/format/filter/bbox.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/format/filter/bbox.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/format/filter/comparison.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/format/filter/comparison.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/format/filter/comparison.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/format/filter/comparison.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/format/filter/comparisonbinary.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/format/filter/comparisonbinary.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/format/filter/comparisonbinary.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/format/filter/comparisonbinary.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/format/filter/contains.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/format/filter/contains.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/format/filter/contains.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/format/filter/contains.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/format/filter/during.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/format/filter/during.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/format/filter/during.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/format/filter/during.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/format/filter/equalto.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/format/filter/equalto.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/format/filter/equalto.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/format/filter/equalto.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/format/filter/filter.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/format/filter/filter.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/format/filter/filter.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/format/filter/filter.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/format/filter/greaterthan.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/format/filter/greaterthan.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/format/filter/greaterthan.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/format/filter/greaterthan.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/format/filter/greaterthanorequalto.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/format/filter/greaterthanorequalto.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/format/filter/greaterthanorequalto.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/format/filter/greaterthanorequalto.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/format/filter/index.jsdoc b/src/vitis/client/javascript/externs/openLayers/ol/ol/format/filter/index.jsdoc
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/format/filter/index.jsdoc
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/format/filter/index.jsdoc
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/format/filter/intersects.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/format/filter/intersects.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/format/filter/intersects.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/format/filter/intersects.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/format/filter/isbetween.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/format/filter/isbetween.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/format/filter/isbetween.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/format/filter/isbetween.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/format/filter/islike.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/format/filter/islike.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/format/filter/islike.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/format/filter/islike.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/format/filter/isnull.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/format/filter/isnull.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/format/filter/isnull.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/format/filter/isnull.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/format/filter/lessthan.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/format/filter/lessthan.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/format/filter/lessthan.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/format/filter/lessthan.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/format/filter/lessthanorequalto.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/format/filter/lessthanorequalto.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/format/filter/lessthanorequalto.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/format/filter/lessthanorequalto.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/format/filter/logicalnary.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/format/filter/logicalnary.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/format/filter/logicalnary.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/format/filter/logicalnary.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/format/filter/not.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/format/filter/not.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/format/filter/not.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/format/filter/not.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/format/filter/notequalto.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/format/filter/notequalto.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/format/filter/notequalto.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/format/filter/notequalto.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/format/filter/or.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/format/filter/or.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/format/filter/or.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/format/filter/or.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/format/filter/spatial.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/format/filter/spatial.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/format/filter/spatial.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/format/filter/spatial.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/format/filter/within.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/format/filter/within.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/format/filter/within.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/format/filter/within.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/format/formattype.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/format/formattype.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/format/formattype.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/format/formattype.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/format/geojson.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/format/geojson.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/format/geojson.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/format/geojson.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/format/gml.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/format/gml.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/format/gml.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/format/gml.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/format/gml2.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/format/gml2.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/format/gml2.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/format/gml2.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/format/gml3.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/format/gml3.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/format/gml3.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/format/gml3.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/format/gmlbase.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/format/gmlbase.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/format/gmlbase.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/format/gmlbase.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/format/gpx.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/format/gpx.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/format/gpx.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/format/gpx.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/format/igc.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/format/igc.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/format/igc.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/format/igc.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/format/igcz.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/format/igcz.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/format/igcz.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/format/igcz.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/format/index.jsdoc b/src/vitis/client/javascript/externs/openLayers/ol/ol/format/index.jsdoc
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/format/index.jsdoc
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/format/index.jsdoc
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/format/jsonfeature.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/format/jsonfeature.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/format/jsonfeature.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/format/jsonfeature.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/format/kml.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/format/kml.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/format/kml.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/format/kml.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/format/mvt.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/format/mvt.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/format/mvt.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/format/mvt.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/format/osmxml.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/format/osmxml.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/format/osmxml.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/format/osmxml.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/format/ows.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/format/ows.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/format/ows.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/format/ows.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/format/polyline.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/format/polyline.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/format/polyline.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/format/polyline.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/format/readme.md b/src/vitis/client/javascript/externs/openLayers/ol/ol/format/readme.md
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/format/readme.md
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/format/readme.md
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/format/textfeature.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/format/textfeature.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/format/textfeature.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/format/textfeature.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/format/topojson.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/format/topojson.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/format/topojson.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/format/topojson.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/format/wfs.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/format/wfs.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/format/wfs.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/format/wfs.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/format/wkt.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/format/wkt.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/format/wkt.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/format/wkt.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/format/wmscapabilities.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/format/wmscapabilities.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/format/wmscapabilities.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/format/wmscapabilities.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/format/wmsgetfeatureinfo.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/format/wmsgetfeatureinfo.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/format/wmsgetfeatureinfo.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/format/wmsgetfeatureinfo.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/format/wmtscapabilities.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/format/wmtscapabilities.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/format/wmtscapabilities.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/format/wmtscapabilities.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/format/xlink.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/format/xlink.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/format/xlink.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/format/xlink.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/format/xml.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/format/xml.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/format/xml.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/format/xml.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/format/xmlfeature.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/format/xmlfeature.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/format/xmlfeature.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/format/xmlfeature.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/format/xsd.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/format/xsd.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/format/xsd.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/format/xsd.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/functions.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/functions.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/functions.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/functions.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/geolocation.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/geolocation.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/geolocation.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/geolocation.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/geolocationproperty.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/geolocationproperty.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/geolocationproperty.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/geolocationproperty.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/geom/circle.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/geom/circle.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/geom/circle.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/geom/circle.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/geom/flat/area.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/geom/flat/area.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/geom/flat/area.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/geom/flat/area.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/geom/flat/center.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/geom/flat/center.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/geom/flat/center.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/geom/flat/center.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/geom/flat/closest.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/geom/flat/closest.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/geom/flat/closest.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/geom/flat/closest.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/geom/flat/contains.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/geom/flat/contains.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/geom/flat/contains.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/geom/flat/contains.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/geom/flat/deflate.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/geom/flat/deflate.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/geom/flat/deflate.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/geom/flat/deflate.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/geom/flat/flip.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/geom/flat/flip.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/geom/flat/flip.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/geom/flat/flip.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/geom/flat/geodesic.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/geom/flat/geodesic.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/geom/flat/geodesic.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/geom/flat/geodesic.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/geom/flat/inflate.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/geom/flat/inflate.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/geom/flat/inflate.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/geom/flat/inflate.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/geom/flat/interiorpoint.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/geom/flat/interiorpoint.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/geom/flat/interiorpoint.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/geom/flat/interiorpoint.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/geom/flat/interpolate.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/geom/flat/interpolate.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/geom/flat/interpolate.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/geom/flat/interpolate.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/geom/flat/intersectsextent.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/geom/flat/intersectsextent.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/geom/flat/intersectsextent.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/geom/flat/intersectsextent.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/geom/flat/length.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/geom/flat/length.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/geom/flat/length.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/geom/flat/length.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/geom/flat/orient.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/geom/flat/orient.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/geom/flat/orient.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/geom/flat/orient.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/geom/flat/reverse.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/geom/flat/reverse.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/geom/flat/reverse.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/geom/flat/reverse.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/geom/flat/segments.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/geom/flat/segments.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/geom/flat/segments.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/geom/flat/segments.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/geom/flat/simplify.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/geom/flat/simplify.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/geom/flat/simplify.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/geom/flat/simplify.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/geom/flat/straightchunk.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/geom/flat/straightchunk.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/geom/flat/straightchunk.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/geom/flat/straightchunk.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/geom/flat/textpath.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/geom/flat/textpath.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/geom/flat/textpath.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/geom/flat/textpath.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/geom/flat/topology.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/geom/flat/topology.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/geom/flat/topology.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/geom/flat/topology.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/geom/flat/transform.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/geom/flat/transform.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/geom/flat/transform.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/geom/flat/transform.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/geom/geom.jsdoc b/src/vitis/client/javascript/externs/openLayers/ol/ol/geom/geom.jsdoc
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/geom/geom.jsdoc
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/geom/geom.jsdoc
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/geom/geometry.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/geom/geometry.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/geom/geometry.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/geom/geometry.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/geom/geometrycollection.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/geom/geometrycollection.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/geom/geometrycollection.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/geom/geometrycollection.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/geom/geometrylayout.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/geom/geometrylayout.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/geom/geometrylayout.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/geom/geometrylayout.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/geom/geometrytype.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/geom/geometrytype.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/geom/geometrytype.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/geom/geometrytype.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/geom/linearring.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/geom/linearring.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/geom/linearring.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/geom/linearring.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/geom/linestring.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/geom/linestring.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/geom/linestring.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/geom/linestring.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/geom/multilinestring.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/geom/multilinestring.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/geom/multilinestring.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/geom/multilinestring.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/geom/multipoint.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/geom/multipoint.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/geom/multipoint.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/geom/multipoint.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/geom/multipolygon.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/geom/multipolygon.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/geom/multipolygon.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/geom/multipolygon.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/geom/point.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/geom/point.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/geom/point.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/geom/point.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/geom/polygon.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/geom/polygon.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/geom/polygon.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/geom/polygon.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/geom/simplegeometry.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/geom/simplegeometry.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/geom/simplegeometry.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/geom/simplegeometry.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/graticule.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/graticule.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/graticule.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/graticule.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/has.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/has.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/has.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/has.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/has.jsdoc b/src/vitis/client/javascript/externs/openLayers/ol/ol/has.jsdoc
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/has.jsdoc
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/has.jsdoc
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/image.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/image.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/image.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/image.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/imagebase.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/imagebase.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/imagebase.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/imagebase.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/imagecanvas.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/imagecanvas.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/imagecanvas.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/imagecanvas.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/imagestate.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/imagestate.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/imagestate.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/imagestate.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/imagetile.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/imagetile.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/imagetile.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/imagetile.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/index.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/index.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/index.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/index.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/interaction.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/interaction.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/interaction.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/interaction.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/interaction/doubleclickzoom.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/interaction/doubleclickzoom.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/interaction/doubleclickzoom.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/interaction/doubleclickzoom.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/interaction/draganddrop.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/interaction/draganddrop.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/interaction/draganddrop.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/interaction/draganddrop.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/interaction/dragbox.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/interaction/dragbox.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/interaction/dragbox.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/interaction/dragbox.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/interaction/dragpan.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/interaction/dragpan.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/interaction/dragpan.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/interaction/dragpan.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/interaction/dragrotate.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/interaction/dragrotate.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/interaction/dragrotate.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/interaction/dragrotate.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/interaction/dragrotateandzoom.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/interaction/dragrotateandzoom.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/interaction/dragrotateandzoom.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/interaction/dragrotateandzoom.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/interaction/dragzoom.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/interaction/dragzoom.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/interaction/dragzoom.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/interaction/dragzoom.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/interaction/draw.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/interaction/draw.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/interaction/draw.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/interaction/draw.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/interaction/draweventtype.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/interaction/draweventtype.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/interaction/draweventtype.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/interaction/draweventtype.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/interaction/extent.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/interaction/extent.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/interaction/extent.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/interaction/extent.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/interaction/extenteventtype.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/interaction/extenteventtype.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/interaction/extenteventtype.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/interaction/extenteventtype.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/interaction/interaction.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/interaction/interaction.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/interaction/interaction.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/interaction/interaction.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/interaction/interaction.jsdoc b/src/vitis/client/javascript/externs/openLayers/ol/ol/interaction/interaction.jsdoc
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/interaction/interaction.jsdoc
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/interaction/interaction.jsdoc
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/interaction/keyboardpan.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/interaction/keyboardpan.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/interaction/keyboardpan.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/interaction/keyboardpan.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/interaction/keyboardzoom.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/interaction/keyboardzoom.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/interaction/keyboardzoom.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/interaction/keyboardzoom.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/interaction/modify.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/interaction/modify.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/interaction/modify.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/interaction/modify.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/interaction/modifyeventtype.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/interaction/modifyeventtype.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/interaction/modifyeventtype.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/interaction/modifyeventtype.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/interaction/mousewheelzoom.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/interaction/mousewheelzoom.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/interaction/mousewheelzoom.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/interaction/mousewheelzoom.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/interaction/pinchrotate.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/interaction/pinchrotate.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/interaction/pinchrotate.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/interaction/pinchrotate.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/interaction/pinchzoom.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/interaction/pinchzoom.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/interaction/pinchzoom.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/interaction/pinchzoom.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/interaction/pointer.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/interaction/pointer.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/interaction/pointer.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/interaction/pointer.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/interaction/property.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/interaction/property.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/interaction/property.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/interaction/property.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/interaction/select.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/interaction/select.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/interaction/select.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/interaction/select.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/interaction/snap.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/interaction/snap.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/interaction/snap.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/interaction/snap.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/interaction/translate.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/interaction/translate.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/interaction/translate.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/interaction/translate.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/interaction/translateeventtype.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/interaction/translateeventtype.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/interaction/translateeventtype.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/interaction/translateeventtype.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/kinetic.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/kinetic.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/kinetic.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/kinetic.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/layer/base.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/layer/base.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/layer/base.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/layer/base.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/layer/group.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/layer/group.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/layer/group.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/layer/group.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/layer/heatmap.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/layer/heatmap.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/layer/heatmap.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/layer/heatmap.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/layer/image.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/layer/image.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/layer/image.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/layer/image.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/layer/layer.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/layer/layer.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/layer/layer.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/layer/layer.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/layer/layer.jsdoc b/src/vitis/client/javascript/externs/openLayers/ol/ol/layer/layer.jsdoc
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/layer/layer.jsdoc
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/layer/layer.jsdoc
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/layer/property.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/layer/property.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/layer/property.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/layer/property.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/layer/tile.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/layer/tile.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/layer/tile.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/layer/tile.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/layer/tileproperty.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/layer/tileproperty.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/layer/tileproperty.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/layer/tileproperty.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/layer/vector.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/layer/vector.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/layer/vector.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/layer/vector.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/layer/vectorrendertype.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/layer/vectorrendertype.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/layer/vectorrendertype.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/layer/vectorrendertype.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/layer/vectortile.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/layer/vectortile.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/layer/vectortile.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/layer/vectortile.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/layer/vectortilerendertype.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/layer/vectortilerendertype.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/layer/vectortilerendertype.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/layer/vectortilerendertype.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/layertype.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/layertype.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/layertype.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/layertype.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/loadingstrategy.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/loadingstrategy.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/loadingstrategy.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/loadingstrategy.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/loadingstrategy.jsdoc b/src/vitis/client/javascript/externs/openLayers/ol/ol/loadingstrategy.jsdoc
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/loadingstrategy.jsdoc
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/loadingstrategy.jsdoc
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/map.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/map.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/map.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/map.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/mapbrowserevent.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/mapbrowserevent.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/mapbrowserevent.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/mapbrowserevent.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/mapbrowsereventhandler.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/mapbrowsereventhandler.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/mapbrowsereventhandler.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/mapbrowsereventhandler.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/mapbrowsereventtype.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/mapbrowsereventtype.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/mapbrowsereventtype.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/mapbrowsereventtype.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/mapbrowserpointerevent.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/mapbrowserpointerevent.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/mapbrowserpointerevent.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/mapbrowserpointerevent.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/mapevent.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/mapevent.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/mapevent.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/mapevent.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/mapeventtype.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/mapeventtype.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/mapeventtype.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/mapeventtype.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/mapproperty.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/mapproperty.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/mapproperty.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/mapproperty.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/math.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/math.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/math.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/math.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/net.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/net.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/net.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/net.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/obj.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/obj.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/obj.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/obj.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/object.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/object.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/object.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/object.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/objecteventtype.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/objecteventtype.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/objecteventtype.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/objecteventtype.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/observable.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/observable.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/observable.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/observable.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/overlay.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/overlay.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/overlay.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/overlay.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/overlaypositioning.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/overlaypositioning.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/overlaypositioning.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/overlaypositioning.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/pluggablemap.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/pluggablemap.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/pluggablemap.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/pluggablemap.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/plugins.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/plugins.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/plugins.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/plugins.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/plugintype.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/plugintype.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/plugintype.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/plugintype.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/pointer/eventsource.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/pointer/eventsource.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/pointer/eventsource.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/pointer/eventsource.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/pointer/eventtype.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/pointer/eventtype.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/pointer/eventtype.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/pointer/eventtype.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/pointer/mousesource.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/pointer/mousesource.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/pointer/mousesource.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/pointer/mousesource.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/pointer/mssource.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/pointer/mssource.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/pointer/mssource.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/pointer/mssource.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/pointer/nativesource.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/pointer/nativesource.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/pointer/nativesource.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/pointer/nativesource.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/pointer/pointerevent.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/pointer/pointerevent.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/pointer/pointerevent.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/pointer/pointerevent.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/pointer/pointereventhandler.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/pointer/pointereventhandler.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/pointer/pointereventhandler.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/pointer/pointereventhandler.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/pointer/touchsource.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/pointer/touchsource.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/pointer/touchsource.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/pointer/touchsource.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/proj.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/proj.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/proj.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/proj.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/proj/common.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/proj/common.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/proj/common.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/proj/common.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/proj/epsg3857.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/proj/epsg3857.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/proj/epsg3857.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/proj/epsg3857.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/proj/epsg4326.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/proj/epsg4326.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/proj/epsg4326.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/proj/epsg4326.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/proj/index.jsdoc b/src/vitis/client/javascript/externs/openLayers/ol/ol/proj/index.jsdoc
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/proj/index.jsdoc
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/proj/index.jsdoc
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/proj/proj4.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/proj/proj4.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/proj/proj4.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/proj/proj4.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/proj/projection.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/proj/projection.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/proj/projection.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/proj/projection.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/proj/projections.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/proj/projections.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/proj/projections.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/proj/projections.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/proj/transforms.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/proj/transforms.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/proj/transforms.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/proj/transforms.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/proj/units.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/proj/units.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/proj/units.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/proj/units.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/render.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/render.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/render.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/render.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/render.jsdoc b/src/vitis/client/javascript/externs/openLayers/ol/ol/render.jsdoc
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/render.jsdoc
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/render.jsdoc
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/render/box.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/render/box.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/render/box.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/render/box.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/render/canvas.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/render/canvas.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/render/canvas.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/render/canvas.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/render/canvas/imagereplay.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/render/canvas/imagereplay.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/render/canvas/imagereplay.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/render/canvas/imagereplay.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/render/canvas/immediate.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/render/canvas/immediate.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/render/canvas/immediate.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/render/canvas/immediate.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/render/canvas/index.jsdoc b/src/vitis/client/javascript/externs/openLayers/ol/ol/render/canvas/index.jsdoc
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/render/canvas/index.jsdoc
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/render/canvas/index.jsdoc
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/render/canvas/instruction.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/render/canvas/instruction.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/render/canvas/instruction.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/render/canvas/instruction.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/render/canvas/linestringreplay.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/render/canvas/linestringreplay.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/render/canvas/linestringreplay.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/render/canvas/linestringreplay.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/render/canvas/polygonreplay.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/render/canvas/polygonreplay.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/render/canvas/polygonreplay.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/render/canvas/polygonreplay.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/render/canvas/replay.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/render/canvas/replay.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/render/canvas/replay.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/render/canvas/replay.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/render/canvas/replaygroup.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/render/canvas/replaygroup.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/render/canvas/replaygroup.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/render/canvas/replaygroup.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/render/canvas/textreplay.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/render/canvas/textreplay.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/render/canvas/textreplay.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/render/canvas/textreplay.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/render/event.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/render/event.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/render/event.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/render/event.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/render/eventtype.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/render/eventtype.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/render/eventtype.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/render/eventtype.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/render/feature.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/render/feature.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/render/feature.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/render/feature.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/render/replay.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/render/replay.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/render/replay.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/render/replay.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/render/replaygroup.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/render/replaygroup.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/render/replaygroup.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/render/replaygroup.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/render/replaytype.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/render/replaytype.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/render/replaytype.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/render/replaytype.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/render/vectorcontext.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/render/vectorcontext.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/render/vectorcontext.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/render/vectorcontext.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/render/webgl.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/render/webgl.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/render/webgl.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/render/webgl.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/render/webgl/circlereplay.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/render/webgl/circlereplay.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/render/webgl/circlereplay.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/render/webgl/circlereplay.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/render/webgl/circlereplay/defaultshader.glsl b/src/vitis/client/javascript/externs/openLayers/ol/ol/render/webgl/circlereplay/defaultshader.glsl
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/render/webgl/circlereplay/defaultshader.glsl
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/render/webgl/circlereplay/defaultshader.glsl
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/render/webgl/circlereplay/defaultshader.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/render/webgl/circlereplay/defaultshader.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/render/webgl/circlereplay/defaultshader.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/render/webgl/circlereplay/defaultshader.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/render/webgl/circlereplay/defaultshader/locations.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/render/webgl/circlereplay/defaultshader/locations.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/render/webgl/circlereplay/defaultshader/locations.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/render/webgl/circlereplay/defaultshader/locations.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/render/webgl/imagereplay.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/render/webgl/imagereplay.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/render/webgl/imagereplay.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/render/webgl/imagereplay.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/render/webgl/immediate.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/render/webgl/immediate.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/render/webgl/immediate.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/render/webgl/immediate.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/render/webgl/index.jsdoc b/src/vitis/client/javascript/externs/openLayers/ol/ol/render/webgl/index.jsdoc
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/render/webgl/index.jsdoc
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/render/webgl/index.jsdoc
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/render/webgl/linestringreplay.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/render/webgl/linestringreplay.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/render/webgl/linestringreplay.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/render/webgl/linestringreplay.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/render/webgl/linestringreplay/defaultshader.glsl b/src/vitis/client/javascript/externs/openLayers/ol/ol/render/webgl/linestringreplay/defaultshader.glsl
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/render/webgl/linestringreplay/defaultshader.glsl
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/render/webgl/linestringreplay/defaultshader.glsl
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/render/webgl/linestringreplay/defaultshader.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/render/webgl/linestringreplay/defaultshader.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/render/webgl/linestringreplay/defaultshader.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/render/webgl/linestringreplay/defaultshader.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/render/webgl/linestringreplay/defaultshader/locations.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/render/webgl/linestringreplay/defaultshader/locations.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/render/webgl/linestringreplay/defaultshader/locations.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/render/webgl/linestringreplay/defaultshader/locations.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/render/webgl/polygonreplay.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/render/webgl/polygonreplay.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/render/webgl/polygonreplay.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/render/webgl/polygonreplay.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/render/webgl/polygonreplay/defaultshader.glsl b/src/vitis/client/javascript/externs/openLayers/ol/ol/render/webgl/polygonreplay/defaultshader.glsl
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/render/webgl/polygonreplay/defaultshader.glsl
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/render/webgl/polygonreplay/defaultshader.glsl
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/render/webgl/polygonreplay/defaultshader.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/render/webgl/polygonreplay/defaultshader.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/render/webgl/polygonreplay/defaultshader.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/render/webgl/polygonreplay/defaultshader.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/render/webgl/polygonreplay/defaultshader/locations.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/render/webgl/polygonreplay/defaultshader/locations.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/render/webgl/polygonreplay/defaultshader/locations.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/render/webgl/polygonreplay/defaultshader/locations.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/render/webgl/replay.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/render/webgl/replay.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/render/webgl/replay.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/render/webgl/replay.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/render/webgl/replaygroup.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/render/webgl/replaygroup.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/render/webgl/replaygroup.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/render/webgl/replaygroup.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/render/webgl/textreplay.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/render/webgl/textreplay.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/render/webgl/textreplay.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/render/webgl/textreplay.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/render/webgl/texturereplay.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/render/webgl/texturereplay.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/render/webgl/texturereplay.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/render/webgl/texturereplay.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/render/webgl/texturereplay/defaultshader.glsl b/src/vitis/client/javascript/externs/openLayers/ol/ol/render/webgl/texturereplay/defaultshader.glsl
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/render/webgl/texturereplay/defaultshader.glsl
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/render/webgl/texturereplay/defaultshader.glsl
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/render/webgl/texturereplay/defaultshader.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/render/webgl/texturereplay/defaultshader.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/render/webgl/texturereplay/defaultshader.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/render/webgl/texturereplay/defaultshader.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/render/webgl/texturereplay/defaultshader/locations.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/render/webgl/texturereplay/defaultshader/locations.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/render/webgl/texturereplay/defaultshader/locations.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/render/webgl/texturereplay/defaultshader/locations.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/renderer/canvas/imagelayer.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/renderer/canvas/imagelayer.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/renderer/canvas/imagelayer.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/renderer/canvas/imagelayer.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/renderer/canvas/intermediatecanvas.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/renderer/canvas/intermediatecanvas.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/renderer/canvas/intermediatecanvas.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/renderer/canvas/intermediatecanvas.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/renderer/canvas/layer.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/renderer/canvas/layer.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/renderer/canvas/layer.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/renderer/canvas/layer.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/renderer/canvas/map.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/renderer/canvas/map.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/renderer/canvas/map.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/renderer/canvas/map.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/renderer/canvas/tilelayer.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/renderer/canvas/tilelayer.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/renderer/canvas/tilelayer.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/renderer/canvas/tilelayer.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/renderer/canvas/vectorlayer.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/renderer/canvas/vectorlayer.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/renderer/canvas/vectorlayer.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/renderer/canvas/vectorlayer.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/renderer/canvas/vectortilelayer.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/renderer/canvas/vectortilelayer.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/renderer/canvas/vectortilelayer.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/renderer/canvas/vectortilelayer.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/renderer/index.jsdoc b/src/vitis/client/javascript/externs/openLayers/ol/ol/renderer/index.jsdoc
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/renderer/index.jsdoc
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/renderer/index.jsdoc
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/renderer/layer.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/renderer/layer.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/renderer/layer.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/renderer/layer.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/renderer/map.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/renderer/map.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/renderer/map.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/renderer/map.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/renderer/type.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/renderer/type.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/renderer/type.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/renderer/type.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/renderer/vector.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/renderer/vector.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/renderer/vector.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/renderer/vector.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/renderer/webgl/defaultmapshader.glsl b/src/vitis/client/javascript/externs/openLayers/ol/ol/renderer/webgl/defaultmapshader.glsl
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/renderer/webgl/defaultmapshader.glsl
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/renderer/webgl/defaultmapshader.glsl
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/renderer/webgl/defaultmapshader.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/renderer/webgl/defaultmapshader.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/renderer/webgl/defaultmapshader.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/renderer/webgl/defaultmapshader.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/renderer/webgl/defaultmapshader/locations.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/renderer/webgl/defaultmapshader/locations.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/renderer/webgl/defaultmapshader/locations.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/renderer/webgl/defaultmapshader/locations.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/renderer/webgl/imagelayer.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/renderer/webgl/imagelayer.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/renderer/webgl/imagelayer.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/renderer/webgl/imagelayer.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/renderer/webgl/layer.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/renderer/webgl/layer.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/renderer/webgl/layer.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/renderer/webgl/layer.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/renderer/webgl/map.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/renderer/webgl/map.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/renderer/webgl/map.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/renderer/webgl/map.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/renderer/webgl/tilelayer.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/renderer/webgl/tilelayer.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/renderer/webgl/tilelayer.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/renderer/webgl/tilelayer.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/renderer/webgl/tilelayershader.glsl b/src/vitis/client/javascript/externs/openLayers/ol/ol/renderer/webgl/tilelayershader.glsl
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/renderer/webgl/tilelayershader.glsl
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/renderer/webgl/tilelayershader.glsl
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/renderer/webgl/tilelayershader.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/renderer/webgl/tilelayershader.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/renderer/webgl/tilelayershader.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/renderer/webgl/tilelayershader.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/renderer/webgl/tilelayershader/locations.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/renderer/webgl/tilelayershader/locations.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/renderer/webgl/tilelayershader/locations.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/renderer/webgl/tilelayershader/locations.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/renderer/webgl/vectorlayer.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/renderer/webgl/vectorlayer.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/renderer/webgl/vectorlayer.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/renderer/webgl/vectorlayer.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/reproj.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/reproj.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/reproj.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/reproj.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/reproj/image.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/reproj/image.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/reproj/image.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/reproj/image.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/reproj/tile.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/reproj/tile.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/reproj/tile.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/reproj/tile.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/reproj/triangulation.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/reproj/triangulation.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/reproj/triangulation.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/reproj/triangulation.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/resolutionconstraint.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/resolutionconstraint.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/resolutionconstraint.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/resolutionconstraint.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/rotationconstraint.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/rotationconstraint.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/rotationconstraint.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/rotationconstraint.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/size.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/size.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/size.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/size.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/source.jsdoc b/src/vitis/client/javascript/externs/openLayers/ol/ol/source.jsdoc
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/source.jsdoc
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/source.jsdoc
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/source/bingmaps.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/source/bingmaps.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/source/bingmaps.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/source/bingmaps.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/source/cartodb.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/source/cartodb.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/source/cartodb.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/source/cartodb.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/source/cluster.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/source/cluster.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/source/cluster.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/source/cluster.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/source/image.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/source/image.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/source/image.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/source/image.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/source/imagearcgisrest.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/source/imagearcgisrest.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/source/imagearcgisrest.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/source/imagearcgisrest.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/source/imagecanvas.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/source/imagecanvas.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/source/imagecanvas.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/source/imagecanvas.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/source/imagemapguide.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/source/imagemapguide.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/source/imagemapguide.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/source/imagemapguide.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/source/imagestatic.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/source/imagestatic.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/source/imagestatic.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/source/imagestatic.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/source/imagevector.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/source/imagevector.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/source/imagevector.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/source/imagevector.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/source/imagewms.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/source/imagewms.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/source/imagewms.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/source/imagewms.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/source/osm.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/source/osm.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/source/osm.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/source/osm.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/source/raster.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/source/raster.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/source/raster.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/source/raster.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/source/rasteroperationtype.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/source/rasteroperationtype.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/source/rasteroperationtype.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/source/rasteroperationtype.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/source/source.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/source/source.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/source/source.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/source/source.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/source/stamen.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/source/stamen.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/source/stamen.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/source/stamen.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/source/state.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/source/state.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/source/state.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/source/state.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/source/tile.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/source/tile.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/source/tile.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/source/tile.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/source/tilearcgisrest.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/source/tilearcgisrest.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/source/tilearcgisrest.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/source/tilearcgisrest.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/source/tiledebug.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/source/tiledebug.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/source/tiledebug.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/source/tiledebug.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/source/tileeventtype.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/source/tileeventtype.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/source/tileeventtype.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/source/tileeventtype.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/source/tileimage.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/source/tileimage.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/source/tileimage.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/source/tileimage.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/source/tilejson.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/source/tilejson.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/source/tilejson.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/source/tilejson.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/source/tileutfgrid.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/source/tileutfgrid.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/source/tileutfgrid.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/source/tileutfgrid.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/source/tilewms.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/source/tilewms.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/source/tilewms.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/source/tilewms.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/source/urltile.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/source/urltile.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/source/urltile.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/source/urltile.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/source/vector.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/source/vector.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/source/vector.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/source/vector.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/source/vectoreventtype.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/source/vectoreventtype.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/source/vectoreventtype.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/source/vectoreventtype.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/source/vectortile.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/source/vectortile.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/source/vectortile.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/source/vectortile.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/source/wmsservertype.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/source/wmsservertype.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/source/wmsservertype.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/source/wmsservertype.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/source/wmts.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/source/wmts.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/source/wmts.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/source/wmts.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/source/wmtsrequestencoding.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/source/wmtsrequestencoding.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/source/wmtsrequestencoding.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/source/wmtsrequestencoding.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/source/xyz.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/source/xyz.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/source/xyz.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/source/xyz.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/source/zoomify.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/source/zoomify.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/source/zoomify.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/source/zoomify.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/sphere.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/sphere.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/sphere.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/sphere.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/string.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/string.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/string.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/string.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/structs/linkedlist.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/structs/linkedlist.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/structs/linkedlist.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/structs/linkedlist.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/structs/lrucache.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/structs/lrucache.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/structs/lrucache.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/structs/lrucache.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/structs/priorityqueue.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/structs/priorityqueue.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/structs/priorityqueue.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/structs/priorityqueue.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/structs/rbush.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/structs/rbush.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/structs/rbush.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/structs/rbush.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/style.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/style.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/style.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/style.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/style/atlas.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/style/atlas.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/style/atlas.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/style/atlas.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/style/atlasmanager.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/style/atlasmanager.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/style/atlasmanager.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/style/atlasmanager.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/style/circle.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/style/circle.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/style/circle.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/style/circle.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/style/fill.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/style/fill.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/style/fill.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/style/fill.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/style/icon.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/style/icon.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/style/icon.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/style/icon.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/style/iconanchorunits.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/style/iconanchorunits.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/style/iconanchorunits.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/style/iconanchorunits.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/style/iconimage.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/style/iconimage.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/style/iconimage.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/style/iconimage.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/style/iconimagecache.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/style/iconimagecache.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/style/iconimagecache.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/style/iconimagecache.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/style/iconorigin.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/style/iconorigin.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/style/iconorigin.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/style/iconorigin.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/style/image.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/style/image.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/style/image.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/style/image.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/style/index.jsdoc b/src/vitis/client/javascript/externs/openLayers/ol/ol/style/index.jsdoc
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/style/index.jsdoc
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/style/index.jsdoc
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/style/regularshape.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/style/regularshape.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/style/regularshape.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/style/regularshape.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/style/stroke.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/style/stroke.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/style/stroke.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/style/stroke.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/style/style.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/style/style.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/style/style.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/style/style.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/style/text.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/style/text.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/style/text.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/style/text.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/style/textplacement.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/style/textplacement.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/style/textplacement.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/style/textplacement.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/tile.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/tile.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/tile.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/tile.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/tilecache.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/tilecache.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/tilecache.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/tilecache.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/tilecoord.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/tilecoord.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/tilecoord.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/tilecoord.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/tilegrid.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/tilegrid.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/tilegrid.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/tilegrid.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/tilegrid/index.jsdoc b/src/vitis/client/javascript/externs/openLayers/ol/ol/tilegrid/index.jsdoc
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/tilegrid/index.jsdoc
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/tilegrid/index.jsdoc
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/tilegrid/tilegrid.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/tilegrid/tilegrid.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/tilegrid/tilegrid.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/tilegrid/tilegrid.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/tilegrid/wmts.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/tilegrid/wmts.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/tilegrid/wmts.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/tilegrid/wmts.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/tilequeue.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/tilequeue.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/tilequeue.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/tilequeue.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/tilerange.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/tilerange.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/tilerange.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/tilerange.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/tilestate.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/tilestate.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/tilestate.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/tilestate.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/tileurlfunction.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/tileurlfunction.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/tileurlfunction.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/tileurlfunction.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/transform.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/transform.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/transform.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/transform.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/typedefs.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/typedefs.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/typedefs.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/typedefs.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/uri.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/uri.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/uri.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/uri.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/vec/mat4.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/vec/mat4.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/vec/mat4.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/vec/mat4.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/vectorimagetile.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/vectorimagetile.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/vectorimagetile.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/vectorimagetile.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/vectortile.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/vectortile.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/vectortile.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/vectortile.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/view.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/view.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/view.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/view.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/viewhint.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/viewhint.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/viewhint.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/viewhint.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/viewproperty.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/viewproperty.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/viewproperty.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/viewproperty.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/webgl.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/webgl.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/webgl.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/webgl.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/webgl/buffer.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/webgl/buffer.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/webgl/buffer.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/webgl/buffer.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/webgl/context.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/webgl/context.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/webgl/context.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/webgl/context.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/webgl/contexteventtype.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/webgl/contexteventtype.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/webgl/contexteventtype.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/webgl/contexteventtype.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/webgl/fragment.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/webgl/fragment.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/webgl/fragment.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/webgl/fragment.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/webgl/shader.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/webgl/shader.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/webgl/shader.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/webgl/shader.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/webgl/shader.mustache b/src/vitis/client/javascript/externs/openLayers/ol/ol/webgl/shader.mustache
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/webgl/shader.mustache
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/webgl/shader.mustache
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/webgl/shaderlocations.mustache b/src/vitis/client/javascript/externs/openLayers/ol/ol/webgl/shaderlocations.mustache
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/webgl/shaderlocations.mustache
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/webgl/shaderlocations.mustache
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/webgl/vertex.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/webgl/vertex.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/webgl/vertex.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/webgl/vertex.js
diff --git a/vmap/client/javascript/externs/openLayers/ol/ol/xml.js b/src/vitis/client/javascript/externs/openLayers/ol/ol/xml.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol/ol/xml.js
rename to src/vitis/client/javascript/externs/openLayers/ol/ol/xml.js
diff --git a/vmap/client/javascript/externs/openLayers/ol3-ext/licence.txt b/src/vitis/client/javascript/externs/openLayers/ol3-ext/licence.txt
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol3-ext/licence.txt
rename to src/vitis/client/javascript/externs/openLayers/ol3-ext/licence.txt
diff --git a/vmap/client/javascript/externs/openLayers/ol3-ext/readme.txt b/src/vitis/client/javascript/externs/openLayers/ol3-ext/readme.txt
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol3-ext/readme.txt
rename to src/vitis/client/javascript/externs/openLayers/ol3-ext/readme.txt
diff --git a/vmap/client/javascript/externs/openLayers/ol3-ext/style/fonts/fontanc.def.js b/src/vitis/client/javascript/externs/openLayers/ol3-ext/style/fonts/fontanc.def.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol3-ext/style/fonts/fontanc.def.js
rename to src/vitis/client/javascript/externs/openLayers/ol3-ext/style/fonts/fontanc.def.js
diff --git a/vmap/client/javascript/externs/openLayers/ol3-ext/style/fonts/fontawesome.def.js b/src/vitis/client/javascript/externs/openLayers/ol3-ext/style/fonts/fontawesome.def.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol3-ext/style/fonts/fontawesome.def.js
rename to src/vitis/client/javascript/externs/openLayers/ol3-ext/style/fonts/fontawesome.def.js
diff --git a/vmap/client/javascript/externs/openLayers/ol3-ext/style/fonts/fontveremes.def.js b/src/vitis/client/javascript/externs/openLayers/ol3-ext/style/fonts/fontveremes.def.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol3-ext/style/fonts/fontveremes.def.js
rename to src/vitis/client/javascript/externs/openLayers/ol3-ext/style/fonts/fontveremes.def.js
diff --git a/vmap/client/javascript/externs/openLayers/ol3-ext/style/fontsymbol.js b/src/vitis/client/javascript/externs/openLayers/ol3-ext/style/fontsymbol.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol3-ext/style/fontsymbol.js
rename to src/vitis/client/javascript/externs/openLayers/ol3-ext/style/fontsymbol.js
diff --git a/vmap/client/javascript/externs/openLayers/ol3-ext/style/shadowstyle.js b/src/vitis/client/javascript/externs/openLayers/ol3-ext/style/shadowstyle.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol3-ext/style/shadowstyle.js
rename to src/vitis/client/javascript/externs/openLayers/ol3-ext/style/shadowstyle.js
diff --git a/vmap/client/javascript/externs/openLayers/ol3-ext/utils/ol.ordering.js b/src/vitis/client/javascript/externs/openLayers/ol3-ext/utils/ol.ordering.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol3-ext/utils/ol.ordering.js
rename to src/vitis/client/javascript/externs/openLayers/ol3-ext/utils/ol.ordering.js
diff --git a/vmap/client/javascript/externs/openLayers/ol3-veremes/mobilemodify.js b/src/vitis/client/javascript/externs/openLayers/ol3-veremes/mobilemodify.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol3-veremes/mobilemodify.js
rename to src/vitis/client/javascript/externs/openLayers/ol3-veremes/mobilemodify.js
diff --git a/vmap/client/javascript/externs/openLayers/ol3-veremes/ol.veremes.js b/src/vitis/client/javascript/externs/openLayers/ol3-veremes/ol.veremes.js
similarity index 100%
rename from vmap/client/javascript/externs/openLayers/ol3-veremes/ol.veremes.js
rename to src/vitis/client/javascript/externs/openLayers/ol3-veremes/ol.veremes.js
diff --git a/vmap/client/javascript/externs/rgraph/RGraph.bar_min.js b/src/vitis/client/javascript/externs/rgraph/RGraph.bar_min.js
similarity index 100%
rename from vmap/client/javascript/externs/rgraph/RGraph.bar_min.js
rename to src/vitis/client/javascript/externs/rgraph/RGraph.bar_min.js
diff --git a/vmap/client/javascript/externs/rgraph/RGraph.common.context_min.js b/src/vitis/client/javascript/externs/rgraph/RGraph.common.context_min.js
similarity index 100%
rename from vmap/client/javascript/externs/rgraph/RGraph.common.context_min.js
rename to src/vitis/client/javascript/externs/rgraph/RGraph.common.context_min.js
diff --git a/vmap/client/javascript/externs/rgraph/RGraph.common.core_min.js b/src/vitis/client/javascript/externs/rgraph/RGraph.common.core_min.js
similarity index 100%
rename from vmap/client/javascript/externs/rgraph/RGraph.common.core_min.js
rename to src/vitis/client/javascript/externs/rgraph/RGraph.common.core_min.js
diff --git a/vmap/client/javascript/externs/rgraph/RGraph.common.dynamic_min.js b/src/vitis/client/javascript/externs/rgraph/RGraph.common.dynamic_min.js
similarity index 100%
rename from vmap/client/javascript/externs/rgraph/RGraph.common.dynamic_min.js
rename to src/vitis/client/javascript/externs/rgraph/RGraph.common.dynamic_min.js
diff --git a/vmap/client/javascript/externs/rgraph/RGraph.common.effects_min.js b/src/vitis/client/javascript/externs/rgraph/RGraph.common.effects_min.js
similarity index 100%
rename from vmap/client/javascript/externs/rgraph/RGraph.common.effects_min.js
rename to src/vitis/client/javascript/externs/rgraph/RGraph.common.effects_min.js
diff --git a/vmap/client/javascript/externs/rgraph/RGraph.common.key_min.js b/src/vitis/client/javascript/externs/rgraph/RGraph.common.key_min.js
similarity index 100%
rename from vmap/client/javascript/externs/rgraph/RGraph.common.key_min.js
rename to src/vitis/client/javascript/externs/rgraph/RGraph.common.key_min.js
diff --git a/vmap/client/javascript/externs/rgraph/RGraph.common.tooltips_min.js b/src/vitis/client/javascript/externs/rgraph/RGraph.common.tooltips_min.js
similarity index 100%
rename from vmap/client/javascript/externs/rgraph/RGraph.common.tooltips_min.js
rename to src/vitis/client/javascript/externs/rgraph/RGraph.common.tooltips_min.js
diff --git a/vmap/client/javascript/externs/rgraph/RGraph.drawing.rect_min.js b/src/vitis/client/javascript/externs/rgraph/RGraph.drawing.rect_min.js
similarity index 100%
rename from vmap/client/javascript/externs/rgraph/RGraph.drawing.rect_min.js
rename to src/vitis/client/javascript/externs/rgraph/RGraph.drawing.rect_min.js
diff --git a/vmap/client/javascript/externs/rgraph/RGraph.drawing.text_min.js b/src/vitis/client/javascript/externs/rgraph/RGraph.drawing.text_min.js
similarity index 100%
rename from vmap/client/javascript/externs/rgraph/RGraph.drawing.text_min.js
rename to src/vitis/client/javascript/externs/rgraph/RGraph.drawing.text_min.js
diff --git a/vmap/client/javascript/externs/rgraph/RGraph.pie_min.js b/src/vitis/client/javascript/externs/rgraph/RGraph.pie_min.js
similarity index 100%
rename from vmap/client/javascript/externs/rgraph/RGraph.pie_min.js
rename to src/vitis/client/javascript/externs/rgraph/RGraph.pie_min.js
diff --git a/vmap/client/javascript/externs/rgraph/RGraph.scatter_min.js b/src/vitis/client/javascript/externs/rgraph/RGraph.scatter_min.js
similarity index 100%
rename from vmap/client/javascript/externs/rgraph/RGraph.scatter_min.js
rename to src/vitis/client/javascript/externs/rgraph/RGraph.scatter_min.js
diff --git a/vmap/client/javascript/externs/scripts_cryptage.js b/src/vitis/client/javascript/externs/scripts_cryptage.js
similarity index 100%
rename from vmap/client/javascript/externs/scripts_cryptage.js
rename to src/vitis/client/javascript/externs/scripts_cryptage.js
diff --git a/vmap/client/javascript/externs/showdown/showdown.js b/src/vitis/client/javascript/externs/showdown/showdown.js
similarity index 100%
rename from vmap/client/javascript/externs/showdown/showdown.js
rename to src/vitis/client/javascript/externs/showdown/showdown.js
diff --git a/vmap/client/javascript/externs/showdown/showdown.js.map b/src/vitis/client/javascript/externs/showdown/showdown.js.map
similarity index 100%
rename from vmap/client/javascript/externs/showdown/showdown.js.map
rename to src/vitis/client/javascript/externs/showdown/showdown.js.map
diff --git a/vmap/client/javascript/externs/showdown/showdown.min.js b/src/vitis/client/javascript/externs/showdown/showdown.min.js
similarity index 100%
rename from vmap/client/javascript/externs/showdown/showdown.min.js
rename to src/vitis/client/javascript/externs/showdown/showdown.min.js
diff --git a/vmap/client/javascript/externs/showdown/showdown.min.js.map b/src/vitis/client/javascript/externs/showdown/showdown.min.js.map
similarity index 100%
rename from vmap/client/javascript/externs/showdown/showdown.min.js.map
rename to src/vitis/client/javascript/externs/showdown/showdown.min.js.map
diff --git a/vmap/client/javascript/externs/studio/javascript/app/ElementForm.js b/src/vitis/client/javascript/externs/studio/javascript/app/ElementForm.js
old mode 100644
new mode 100755
similarity index 100%
rename from vmap/client/javascript/externs/studio/javascript/app/ElementForm.js
rename to src/vitis/client/javascript/externs/studio/javascript/app/ElementForm.js
diff --git a/vmap/client/javascript/externs/studio/javascript/app/FormBuilder.js b/src/vitis/client/javascript/externs/studio/javascript/app/FormBuilder.js
similarity index 100%
rename from vmap/client/javascript/externs/studio/javascript/app/FormBuilder.js
rename to src/vitis/client/javascript/externs/studio/javascript/app/FormBuilder.js
diff --git a/vmap/client/javascript/externs/studio/javascript/app/FormTools.js b/src/vitis/client/javascript/externs/studio/javascript/app/FormTools.js
similarity index 100%
rename from vmap/client/javascript/externs/studio/javascript/app/FormTools.js
rename to src/vitis/client/javascript/externs/studio/javascript/app/FormTools.js
diff --git a/vmap/client/javascript/externs/studio/javascript/app/JsonLoader.js b/src/vitis/client/javascript/externs/studio/javascript/app/JsonLoader.js
similarity index 100%
rename from vmap/client/javascript/externs/studio/javascript/app/JsonLoader.js
rename to src/vitis/client/javascript/externs/studio/javascript/app/JsonLoader.js
diff --git a/vmap/client/javascript/externs/studio/javascript/app/Utils.js b/src/vitis/client/javascript/externs/studio/javascript/app/Utils.js
similarity index 100%
rename from vmap/client/javascript/externs/studio/javascript/app/Utils.js
rename to src/vitis/client/javascript/externs/studio/javascript/app/Utils.js
diff --git a/vmap/client/javascript/externs/studio/javascript/app/Visualizer.js b/src/vitis/client/javascript/externs/studio/javascript/app/Visualizer.js
similarity index 100%
rename from vmap/client/javascript/externs/studio/javascript/app/Visualizer.js
rename to src/vitis/client/javascript/externs/studio/javascript/app/Visualizer.js
diff --git a/vmap/client/javascript/externs/studio/javascript/app/VisualizerMode/CssMode.js b/src/vitis/client/javascript/externs/studio/javascript/app/VisualizerMode/CssMode.js
similarity index 100%
rename from vmap/client/javascript/externs/studio/javascript/app/VisualizerMode/CssMode.js
rename to src/vitis/client/javascript/externs/studio/javascript/app/VisualizerMode/CssMode.js
diff --git a/vmap/client/javascript/externs/studio/javascript/app/VisualizerMode/FormMode.js b/src/vitis/client/javascript/externs/studio/javascript/app/VisualizerMode/FormMode.js
similarity index 100%
rename from vmap/client/javascript/externs/studio/javascript/app/VisualizerMode/FormMode.js
rename to src/vitis/client/javascript/externs/studio/javascript/app/VisualizerMode/FormMode.js
diff --git a/vmap/client/javascript/externs/studio/javascript/app/VisualizerMode/JsMode.js b/src/vitis/client/javascript/externs/studio/javascript/app/VisualizerMode/JsMode.js
similarity index 100%
rename from vmap/client/javascript/externs/studio/javascript/app/VisualizerMode/JsMode.js
rename to src/vitis/client/javascript/externs/studio/javascript/app/VisualizerMode/JsMode.js
diff --git a/vmap/client/javascript/externs/studio/javascript/app/VisualizerMode/JsonMode.js b/src/vitis/client/javascript/externs/studio/javascript/app/VisualizerMode/JsonMode.js
similarity index 100%
rename from vmap/client/javascript/externs/studio/javascript/app/VisualizerMode/JsonMode.js
rename to src/vitis/client/javascript/externs/studio/javascript/app/VisualizerMode/JsonMode.js
diff --git a/vmap/client/javascript/externs/studio/lang/lang-en.json b/src/vitis/client/javascript/externs/studio/lang/lang-en.json
similarity index 100%
rename from vmap/client/javascript/externs/studio/lang/lang-en.json
rename to src/vitis/client/javascript/externs/studio/lang/lang-en.json
diff --git a/vmap/client/javascript/externs/studio/lang/lang-fr.json b/src/vitis/client/javascript/externs/studio/lang/lang-fr.json
similarity index 100%
rename from vmap/client/javascript/externs/studio/lang/lang-fr.json
rename to src/vitis/client/javascript/externs/studio/lang/lang-fr.json
diff --git a/vmap/client/javascript/externs/studio/less/CodeMirror.less b/src/vitis/client/javascript/externs/studio/less/CodeMirror.less
similarity index 100%
rename from vmap/client/javascript/externs/studio/less/CodeMirror.less
rename to src/vitis/client/javascript/externs/studio/less/CodeMirror.less
diff --git a/vmap/client/javascript/externs/studio/less/studio.less b/src/vitis/client/javascript/externs/studio/less/studio.less
similarity index 100%
rename from vmap/client/javascript/externs/studio/less/studio.less
rename to src/vitis/client/javascript/externs/studio/less/studio.less
diff --git a/vmap/client/javascript/externs/studio/properties/properties.js b/src/vitis/client/javascript/externs/studio/properties/properties.js
similarity index 100%
rename from vmap/client/javascript/externs/studio/properties/properties.js
rename to src/vitis/client/javascript/externs/studio/properties/properties.js
diff --git a/vmap/client/javascript/externs/studio/templates/Componant/Map.html b/src/vitis/client/javascript/externs/studio/templates/Componant/Map.html
similarity index 100%
rename from vmap/client/javascript/externs/studio/templates/Componant/Map.html
rename to src/vitis/client/javascript/externs/studio/templates/Componant/Map.html
diff --git a/vmap/client/javascript/externs/studio/templates/ElementForm.html b/src/vitis/client/javascript/externs/studio/templates/ElementForm.html
similarity index 100%
rename from vmap/client/javascript/externs/studio/templates/ElementForm.html
rename to src/vitis/client/javascript/externs/studio/templates/ElementForm.html
diff --git a/vmap/client/javascript/externs/studio/templates/FormTools.html b/src/vitis/client/javascript/externs/studio/templates/FormTools.html
similarity index 100%
rename from vmap/client/javascript/externs/studio/templates/FormTools.html
rename to src/vitis/client/javascript/externs/studio/templates/FormTools.html
diff --git a/vmap/client/javascript/externs/studio/templates/JsonLoader.html b/src/vitis/client/javascript/externs/studio/templates/JsonLoader.html
similarity index 100%
rename from vmap/client/javascript/externs/studio/templates/JsonLoader.html
rename to src/vitis/client/javascript/externs/studio/templates/JsonLoader.html
diff --git a/vmap/client/javascript/externs/studio/templates/MainTemplate.html b/src/vitis/client/javascript/externs/studio/templates/MainTemplate.html
similarity index 100%
rename from vmap/client/javascript/externs/studio/templates/MainTemplate.html
rename to src/vitis/client/javascript/externs/studio/templates/MainTemplate.html
diff --git a/vmap/client/javascript/externs/studio/templates/Visualizer.html b/src/vitis/client/javascript/externs/studio/templates/Visualizer.html
similarity index 100%
rename from vmap/client/javascript/externs/studio/templates/Visualizer.html
rename to src/vitis/client/javascript/externs/studio/templates/Visualizer.html
diff --git a/vmap/client/javascript/externs/studio/templates/VisualizerMode/CssMode.html b/src/vitis/client/javascript/externs/studio/templates/VisualizerMode/CssMode.html
similarity index 100%
rename from vmap/client/javascript/externs/studio/templates/VisualizerMode/CssMode.html
rename to src/vitis/client/javascript/externs/studio/templates/VisualizerMode/CssMode.html
diff --git a/vmap/client/javascript/externs/studio/templates/VisualizerMode/FormMode.html b/src/vitis/client/javascript/externs/studio/templates/VisualizerMode/FormMode.html
similarity index 100%
rename from vmap/client/javascript/externs/studio/templates/VisualizerMode/FormMode.html
rename to src/vitis/client/javascript/externs/studio/templates/VisualizerMode/FormMode.html
diff --git a/vmap/client/javascript/externs/studio/templates/VisualizerMode/JsMode.html b/src/vitis/client/javascript/externs/studio/templates/VisualizerMode/JsMode.html
similarity index 100%
rename from vmap/client/javascript/externs/studio/templates/VisualizerMode/JsMode.html
rename to src/vitis/client/javascript/externs/studio/templates/VisualizerMode/JsMode.html
diff --git a/vmap/client/javascript/externs/studio/templates/VisualizerMode/JsonMode.html b/src/vitis/client/javascript/externs/studio/templates/VisualizerMode/JsonMode.html
similarity index 100%
rename from vmap/client/javascript/externs/studio/templates/VisualizerMode/JsonMode.html
rename to src/vitis/client/javascript/externs/studio/templates/VisualizerMode/JsonMode.html
diff --git a/vmap/client/javascript/externs/tinymce/LICENSE.TXT b/src/vitis/client/javascript/externs/tinymce/LICENSE.TXT
similarity index 100%
rename from vmap/client/javascript/externs/tinymce/LICENSE.TXT
rename to src/vitis/client/javascript/externs/tinymce/LICENSE.TXT
diff --git a/vmap/client/javascript/externs/tinymce/langs/fr_FR.js b/src/vitis/client/javascript/externs/tinymce/langs/fr_FR.js
similarity index 100%
rename from vmap/client/javascript/externs/tinymce/langs/fr_FR.js
rename to src/vitis/client/javascript/externs/tinymce/langs/fr_FR.js
diff --git a/vmap/client/javascript/externs/tinymce/plugins/image/plugin.min.js b/src/vitis/client/javascript/externs/tinymce/plugins/image/plugin.min.js
similarity index 100%
rename from vmap/client/javascript/externs/tinymce/plugins/image/plugin.min.js
rename to src/vitis/client/javascript/externs/tinymce/plugins/image/plugin.min.js
diff --git a/vmap/client/javascript/externs/tinymce/skins/lightgray/content.inline.min.css b/src/vitis/client/javascript/externs/tinymce/skins/lightgray/content.inline.min.css
similarity index 100%
rename from vmap/client/javascript/externs/tinymce/skins/lightgray/content.inline.min.css
rename to src/vitis/client/javascript/externs/tinymce/skins/lightgray/content.inline.min.css
diff --git a/vmap/client/javascript/externs/tinymce/skins/lightgray/content.min.css b/src/vitis/client/javascript/externs/tinymce/skins/lightgray/content.min.css
similarity index 100%
rename from vmap/client/javascript/externs/tinymce/skins/lightgray/content.min.css
rename to src/vitis/client/javascript/externs/tinymce/skins/lightgray/content.min.css
diff --git a/vmap/client/javascript/externs/tinymce/skins/lightgray/fonts/tinymce-small.eot b/src/vitis/client/javascript/externs/tinymce/skins/lightgray/fonts/tinymce-small.eot
similarity index 100%
rename from vmap/client/javascript/externs/tinymce/skins/lightgray/fonts/tinymce-small.eot
rename to src/vitis/client/javascript/externs/tinymce/skins/lightgray/fonts/tinymce-small.eot
diff --git a/vmap/client/javascript/externs/tinymce/skins/lightgray/fonts/tinymce-small.svg b/src/vitis/client/javascript/externs/tinymce/skins/lightgray/fonts/tinymce-small.svg
similarity index 100%
rename from vmap/client/javascript/externs/tinymce/skins/lightgray/fonts/tinymce-small.svg
rename to src/vitis/client/javascript/externs/tinymce/skins/lightgray/fonts/tinymce-small.svg
diff --git a/vmap/client/javascript/externs/tinymce/skins/lightgray/fonts/tinymce-small.ttf b/src/vitis/client/javascript/externs/tinymce/skins/lightgray/fonts/tinymce-small.ttf
similarity index 100%
rename from vmap/client/javascript/externs/tinymce/skins/lightgray/fonts/tinymce-small.ttf
rename to src/vitis/client/javascript/externs/tinymce/skins/lightgray/fonts/tinymce-small.ttf
diff --git a/vmap/client/javascript/externs/tinymce/skins/lightgray/fonts/tinymce-small.woff b/src/vitis/client/javascript/externs/tinymce/skins/lightgray/fonts/tinymce-small.woff
similarity index 100%
rename from vmap/client/javascript/externs/tinymce/skins/lightgray/fonts/tinymce-small.woff
rename to src/vitis/client/javascript/externs/tinymce/skins/lightgray/fonts/tinymce-small.woff
diff --git a/vmap/client/javascript/externs/tinymce/skins/lightgray/fonts/tinymce.eot b/src/vitis/client/javascript/externs/tinymce/skins/lightgray/fonts/tinymce.eot
similarity index 100%
rename from vmap/client/javascript/externs/tinymce/skins/lightgray/fonts/tinymce.eot
rename to src/vitis/client/javascript/externs/tinymce/skins/lightgray/fonts/tinymce.eot
diff --git a/vmap/client/javascript/externs/tinymce/skins/lightgray/fonts/tinymce.svg b/src/vitis/client/javascript/externs/tinymce/skins/lightgray/fonts/tinymce.svg
similarity index 100%
rename from vmap/client/javascript/externs/tinymce/skins/lightgray/fonts/tinymce.svg
rename to src/vitis/client/javascript/externs/tinymce/skins/lightgray/fonts/tinymce.svg
diff --git a/vmap/client/javascript/externs/tinymce/skins/lightgray/fonts/tinymce.ttf b/src/vitis/client/javascript/externs/tinymce/skins/lightgray/fonts/tinymce.ttf
similarity index 100%
rename from vmap/client/javascript/externs/tinymce/skins/lightgray/fonts/tinymce.ttf
rename to src/vitis/client/javascript/externs/tinymce/skins/lightgray/fonts/tinymce.ttf
diff --git a/vmap/client/javascript/externs/tinymce/skins/lightgray/fonts/tinymce.woff b/src/vitis/client/javascript/externs/tinymce/skins/lightgray/fonts/tinymce.woff
similarity index 100%
rename from vmap/client/javascript/externs/tinymce/skins/lightgray/fonts/tinymce.woff
rename to src/vitis/client/javascript/externs/tinymce/skins/lightgray/fonts/tinymce.woff
diff --git a/vmap/client/javascript/externs/tinymce/skins/lightgray/img/anchor.gif b/src/vitis/client/javascript/externs/tinymce/skins/lightgray/img/anchor.gif
similarity index 100%
rename from vmap/client/javascript/externs/tinymce/skins/lightgray/img/anchor.gif
rename to src/vitis/client/javascript/externs/tinymce/skins/lightgray/img/anchor.gif
diff --git a/vmap/client/javascript/externs/tinymce/skins/lightgray/img/loader.gif b/src/vitis/client/javascript/externs/tinymce/skins/lightgray/img/loader.gif
similarity index 100%
rename from vmap/client/javascript/externs/tinymce/skins/lightgray/img/loader.gif
rename to src/vitis/client/javascript/externs/tinymce/skins/lightgray/img/loader.gif
diff --git a/vmap/client/javascript/externs/tinymce/skins/lightgray/img/object.gif b/src/vitis/client/javascript/externs/tinymce/skins/lightgray/img/object.gif
similarity index 100%
rename from vmap/client/javascript/externs/tinymce/skins/lightgray/img/object.gif
rename to src/vitis/client/javascript/externs/tinymce/skins/lightgray/img/object.gif
diff --git a/vmap/client/javascript/externs/tinymce/skins/lightgray/img/trans.gif b/src/vitis/client/javascript/externs/tinymce/skins/lightgray/img/trans.gif
similarity index 100%
rename from vmap/client/javascript/externs/tinymce/skins/lightgray/img/trans.gif
rename to src/vitis/client/javascript/externs/tinymce/skins/lightgray/img/trans.gif
diff --git a/vmap/client/javascript/externs/tinymce/skins/lightgray/skin.ie7.min.css b/src/vitis/client/javascript/externs/tinymce/skins/lightgray/skin.ie7.min.css
similarity index 100%
rename from vmap/client/javascript/externs/tinymce/skins/lightgray/skin.ie7.min.css
rename to src/vitis/client/javascript/externs/tinymce/skins/lightgray/skin.ie7.min.css
diff --git a/vmap/client/javascript/externs/tinymce/skins/lightgray/skin.min.css b/src/vitis/client/javascript/externs/tinymce/skins/lightgray/skin.min.css
similarity index 100%
rename from vmap/client/javascript/externs/tinymce/skins/lightgray/skin.min.css
rename to src/vitis/client/javascript/externs/tinymce/skins/lightgray/skin.min.css
diff --git a/vmap/client/javascript/externs/tinymce/themes/modern/theme.min.js b/src/vitis/client/javascript/externs/tinymce/themes/modern/theme.min.js
similarity index 100%
rename from vmap/client/javascript/externs/tinymce/themes/modern/theme.min.js
rename to src/vitis/client/javascript/externs/tinymce/themes/modern/theme.min.js
diff --git a/vmap/client/javascript/externs/tinymce/tinymce.min.js b/src/vitis/client/javascript/externs/tinymce/tinymce.min.js
similarity index 100%
rename from vmap/client/javascript/externs/tinymce/tinymce.min.js
rename to src/vitis/client/javascript/externs/tinymce/tinymce.min.js
diff --git a/vmap/client/javascript/externs/underscore-min.js b/src/vitis/client/javascript/externs/underscore-min.js
similarity index 100%
rename from vmap/client/javascript/externs/underscore-min.js
rename to src/vitis/client/javascript/externs/underscore-min.js
diff --git a/vmap/client/javascript/externs/underscore.js b/src/vitis/client/javascript/externs/underscore.js
similarity index 100%
rename from vmap/client/javascript/externs/underscore.js
rename to src/vitis/client/javascript/externs/underscore.js
diff --git a/vmap/client/javascript/externs/viewer/Apache-License-2.0.txt b/src/vitis/client/javascript/externs/viewer/Apache-License-2.0.txt
similarity index 100%
rename from vmap/client/javascript/externs/viewer/Apache-License-2.0.txt
rename to src/vitis/client/javascript/externs/viewer/Apache-License-2.0.txt
diff --git a/vmap/client/javascript/externs/viewer/viewer.min.js b/src/vitis/client/javascript/externs/viewer/viewer.min.js
similarity index 100%
rename from vmap/client/javascript/externs/viewer/viewer.min.js
rename to src/vitis/client/javascript/externs/viewer/viewer.min.js
diff --git a/vmap/client/javascript/require/requireVitis.js b/src/vitis/client/javascript/require/requireVitis.js
similarity index 100%
rename from vmap/client/javascript/require/requireVitis.js
rename to src/vitis/client/javascript/require/requireVitis.js
diff --git a/vmap/client/javascript/test/e2e/Output/order/htmlReport.html b/src/vitis/client/javascript/test/e2e/Output/order/htmlReport.html
similarity index 100%
rename from vmap/client/javascript/test/e2e/Output/order/htmlReport.html
rename to src/vitis/client/javascript/test/e2e/Output/order/htmlReport.html
diff --git a/vmap/client/javascript/test/e2e/Output/order/images/1fe7143891469e980d1fcca05a66b3a2.png b/src/vitis/client/javascript/test/e2e/Output/order/images/1fe7143891469e980d1fcca05a66b3a2.png
similarity index 100%
rename from vmap/client/javascript/test/e2e/Output/order/images/1fe7143891469e980d1fcca05a66b3a2.png
rename to src/vitis/client/javascript/test/e2e/Output/order/images/1fe7143891469e980d1fcca05a66b3a2.png
diff --git a/vmap/client/javascript/test/e2e/Output/order/images/22a14751fa17bd62335ee88ba6c6f9e6.png b/src/vitis/client/javascript/test/e2e/Output/order/images/22a14751fa17bd62335ee88ba6c6f9e6.png
similarity index 100%
rename from vmap/client/javascript/test/e2e/Output/order/images/22a14751fa17bd62335ee88ba6c6f9e6.png
rename to src/vitis/client/javascript/test/e2e/Output/order/images/22a14751fa17bd62335ee88ba6c6f9e6.png
diff --git a/vmap/client/javascript/test/e2e/Output/order/images/286dc054fdb1ed4e3c1a14730da91fe3.png b/src/vitis/client/javascript/test/e2e/Output/order/images/286dc054fdb1ed4e3c1a14730da91fe3.png
similarity index 100%
rename from vmap/client/javascript/test/e2e/Output/order/images/286dc054fdb1ed4e3c1a14730da91fe3.png
rename to src/vitis/client/javascript/test/e2e/Output/order/images/286dc054fdb1ed4e3c1a14730da91fe3.png
diff --git a/vmap/client/javascript/test/e2e/Output/order/images/446e6e12b1a4a349745acaa42b1fd65d.png b/src/vitis/client/javascript/test/e2e/Output/order/images/446e6e12b1a4a349745acaa42b1fd65d.png
similarity index 100%
rename from vmap/client/javascript/test/e2e/Output/order/images/446e6e12b1a4a349745acaa42b1fd65d.png
rename to src/vitis/client/javascript/test/e2e/Output/order/images/446e6e12b1a4a349745acaa42b1fd65d.png
diff --git a/vmap/client/javascript/test/e2e/Output/order/images/4e6851a1377af65074210820d5903ea4.png b/src/vitis/client/javascript/test/e2e/Output/order/images/4e6851a1377af65074210820d5903ea4.png
similarity index 100%
rename from vmap/client/javascript/test/e2e/Output/order/images/4e6851a1377af65074210820d5903ea4.png
rename to src/vitis/client/javascript/test/e2e/Output/order/images/4e6851a1377af65074210820d5903ea4.png
diff --git a/vmap/client/javascript/test/e2e/Output/order/images/52280521fa920cd916802fa7bf0752c1.png b/src/vitis/client/javascript/test/e2e/Output/order/images/52280521fa920cd916802fa7bf0752c1.png
similarity index 100%
rename from vmap/client/javascript/test/e2e/Output/order/images/52280521fa920cd916802fa7bf0752c1.png
rename to src/vitis/client/javascript/test/e2e/Output/order/images/52280521fa920cd916802fa7bf0752c1.png
diff --git a/vmap/client/javascript/test/e2e/Output/order/images/565819f55fb9493820b1f462eb1469af.png b/src/vitis/client/javascript/test/e2e/Output/order/images/565819f55fb9493820b1f462eb1469af.png
similarity index 100%
rename from vmap/client/javascript/test/e2e/Output/order/images/565819f55fb9493820b1f462eb1469af.png
rename to src/vitis/client/javascript/test/e2e/Output/order/images/565819f55fb9493820b1f462eb1469af.png
diff --git a/vmap/client/javascript/test/e2e/Output/order/images/5ef9ed38ebad6379a04897ec6f383aeb.png b/src/vitis/client/javascript/test/e2e/Output/order/images/5ef9ed38ebad6379a04897ec6f383aeb.png
similarity index 100%
rename from vmap/client/javascript/test/e2e/Output/order/images/5ef9ed38ebad6379a04897ec6f383aeb.png
rename to src/vitis/client/javascript/test/e2e/Output/order/images/5ef9ed38ebad6379a04897ec6f383aeb.png
diff --git a/vmap/client/javascript/test/e2e/Output/order/images/6c0be7e24610a0144c94df2e1c691718.png b/src/vitis/client/javascript/test/e2e/Output/order/images/6c0be7e24610a0144c94df2e1c691718.png
similarity index 100%
rename from vmap/client/javascript/test/e2e/Output/order/images/6c0be7e24610a0144c94df2e1c691718.png
rename to src/vitis/client/javascript/test/e2e/Output/order/images/6c0be7e24610a0144c94df2e1c691718.png
diff --git a/vmap/client/javascript/test/e2e/Output/order/images/85bd21280813079f2797df7a66b953ec.png b/src/vitis/client/javascript/test/e2e/Output/order/images/85bd21280813079f2797df7a66b953ec.png
similarity index 100%
rename from vmap/client/javascript/test/e2e/Output/order/images/85bd21280813079f2797df7a66b953ec.png
rename to src/vitis/client/javascript/test/e2e/Output/order/images/85bd21280813079f2797df7a66b953ec.png
diff --git a/vmap/client/javascript/test/e2e/Output/order/images/9d224f9d204337458fa46ab0f4b4a3f9.png b/src/vitis/client/javascript/test/e2e/Output/order/images/9d224f9d204337458fa46ab0f4b4a3f9.png
similarity index 100%
rename from vmap/client/javascript/test/e2e/Output/order/images/9d224f9d204337458fa46ab0f4b4a3f9.png
rename to src/vitis/client/javascript/test/e2e/Output/order/images/9d224f9d204337458fa46ab0f4b4a3f9.png
diff --git a/vmap/client/javascript/test/e2e/Output/order/images/a971981cadcc1dafd26000f39ea8a68a.png b/src/vitis/client/javascript/test/e2e/Output/order/images/a971981cadcc1dafd26000f39ea8a68a.png
similarity index 100%
rename from vmap/client/javascript/test/e2e/Output/order/images/a971981cadcc1dafd26000f39ea8a68a.png
rename to src/vitis/client/javascript/test/e2e/Output/order/images/a971981cadcc1dafd26000f39ea8a68a.png
diff --git a/vmap/client/javascript/test/e2e/Output/order/images/aa05ad4c25af482047fb6ea3951a4ed9.png b/src/vitis/client/javascript/test/e2e/Output/order/images/aa05ad4c25af482047fb6ea3951a4ed9.png
similarity index 100%
rename from vmap/client/javascript/test/e2e/Output/order/images/aa05ad4c25af482047fb6ea3951a4ed9.png
rename to src/vitis/client/javascript/test/e2e/Output/order/images/aa05ad4c25af482047fb6ea3951a4ed9.png
diff --git a/vmap/client/javascript/test/e2e/Output/order/images/cb30486ebf3bd7f9aaa687cc51e07134.png b/src/vitis/client/javascript/test/e2e/Output/order/images/cb30486ebf3bd7f9aaa687cc51e07134.png
similarity index 100%
rename from vmap/client/javascript/test/e2e/Output/order/images/cb30486ebf3bd7f9aaa687cc51e07134.png
rename to src/vitis/client/javascript/test/e2e/Output/order/images/cb30486ebf3bd7f9aaa687cc51e07134.png
diff --git a/vmap/client/javascript/test/e2e/Output/order/images/d236806b20deffd8ce0f6393acda549e.png b/src/vitis/client/javascript/test/e2e/Output/order/images/d236806b20deffd8ce0f6393acda549e.png
similarity index 100%
rename from vmap/client/javascript/test/e2e/Output/order/images/d236806b20deffd8ce0f6393acda549e.png
rename to src/vitis/client/javascript/test/e2e/Output/order/images/d236806b20deffd8ce0f6393acda549e.png
diff --git a/vmap/client/javascript/test/e2e/Output/order/images/e11cf5a8b029208fb74fb66c82acc314.png b/src/vitis/client/javascript/test/e2e/Output/order/images/e11cf5a8b029208fb74fb66c82acc314.png
similarity index 100%
rename from vmap/client/javascript/test/e2e/Output/order/images/e11cf5a8b029208fb74fb66c82acc314.png
rename to src/vitis/client/javascript/test/e2e/Output/order/images/e11cf5a8b029208fb74fb66c82acc314.png
diff --git a/vmap/client/javascript/test/e2e/Output/order/images/fd3ebf7f15da963e0243b0763ccf4888.png b/src/vitis/client/javascript/test/e2e/Output/order/images/fd3ebf7f15da963e0243b0763ccf4888.png
similarity index 100%
rename from vmap/client/javascript/test/e2e/Output/order/images/fd3ebf7f15da963e0243b0763ccf4888.png
rename to src/vitis/client/javascript/test/e2e/Output/order/images/fd3ebf7f15da963e0243b0763ccf4888.png
diff --git a/vmap/client/javascript/test/e2e/Output/publication/htmlReport.html b/src/vitis/client/javascript/test/e2e/Output/publication/htmlReport.html
similarity index 100%
rename from vmap/client/javascript/test/e2e/Output/publication/htmlReport.html
rename to src/vitis/client/javascript/test/e2e/Output/publication/htmlReport.html
diff --git a/vmap/client/javascript/test/e2e/Output/publication/images/1a593987e7ca4240d8dfa7d6611b79e7.png b/src/vitis/client/javascript/test/e2e/Output/publication/images/1a593987e7ca4240d8dfa7d6611b79e7.png
similarity index 100%
rename from vmap/client/javascript/test/e2e/Output/publication/images/1a593987e7ca4240d8dfa7d6611b79e7.png
rename to src/vitis/client/javascript/test/e2e/Output/publication/images/1a593987e7ca4240d8dfa7d6611b79e7.png
diff --git a/vmap/client/javascript/test/e2e/Output/publication/images/29ff6bceadd409d2da0d4e1ffe3146ec.png b/src/vitis/client/javascript/test/e2e/Output/publication/images/29ff6bceadd409d2da0d4e1ffe3146ec.png
similarity index 100%
rename from vmap/client/javascript/test/e2e/Output/publication/images/29ff6bceadd409d2da0d4e1ffe3146ec.png
rename to src/vitis/client/javascript/test/e2e/Output/publication/images/29ff6bceadd409d2da0d4e1ffe3146ec.png
diff --git a/vmap/client/javascript/test/e2e/Output/publication/images/31d7ecf9dd49ad85104ef4b491582c27.png b/src/vitis/client/javascript/test/e2e/Output/publication/images/31d7ecf9dd49ad85104ef4b491582c27.png
similarity index 100%
rename from vmap/client/javascript/test/e2e/Output/publication/images/31d7ecf9dd49ad85104ef4b491582c27.png
rename to src/vitis/client/javascript/test/e2e/Output/publication/images/31d7ecf9dd49ad85104ef4b491582c27.png
diff --git a/vmap/client/javascript/test/e2e/Output/publication/images/3d588c2cc178ebbc6085fdbac873049b.png b/src/vitis/client/javascript/test/e2e/Output/publication/images/3d588c2cc178ebbc6085fdbac873049b.png
similarity index 100%
rename from vmap/client/javascript/test/e2e/Output/publication/images/3d588c2cc178ebbc6085fdbac873049b.png
rename to src/vitis/client/javascript/test/e2e/Output/publication/images/3d588c2cc178ebbc6085fdbac873049b.png
diff --git a/vmap/client/javascript/test/e2e/Output/publication/images/66864911363c5dfa802360f4cd169d15.png b/src/vitis/client/javascript/test/e2e/Output/publication/images/66864911363c5dfa802360f4cd169d15.png
similarity index 100%
rename from vmap/client/javascript/test/e2e/Output/publication/images/66864911363c5dfa802360f4cd169d15.png
rename to src/vitis/client/javascript/test/e2e/Output/publication/images/66864911363c5dfa802360f4cd169d15.png
diff --git a/vmap/client/javascript/test/e2e/Output/publication/images/71acb5849026bc31c2e1a3efaf750c8c.png b/src/vitis/client/javascript/test/e2e/Output/publication/images/71acb5849026bc31c2e1a3efaf750c8c.png
similarity index 100%
rename from vmap/client/javascript/test/e2e/Output/publication/images/71acb5849026bc31c2e1a3efaf750c8c.png
rename to src/vitis/client/javascript/test/e2e/Output/publication/images/71acb5849026bc31c2e1a3efaf750c8c.png
diff --git a/vmap/client/javascript/test/e2e/Output/publication/images/859d507231ab559be0caa350c33361b0.png b/src/vitis/client/javascript/test/e2e/Output/publication/images/859d507231ab559be0caa350c33361b0.png
similarity index 100%
rename from vmap/client/javascript/test/e2e/Output/publication/images/859d507231ab559be0caa350c33361b0.png
rename to src/vitis/client/javascript/test/e2e/Output/publication/images/859d507231ab559be0caa350c33361b0.png
diff --git a/vmap/client/javascript/test/e2e/Output/publication/images/9bbbcfee24b1eeadfe4cbebce3d68f37.png b/src/vitis/client/javascript/test/e2e/Output/publication/images/9bbbcfee24b1eeadfe4cbebce3d68f37.png
similarity index 100%
rename from vmap/client/javascript/test/e2e/Output/publication/images/9bbbcfee24b1eeadfe4cbebce3d68f37.png
rename to src/vitis/client/javascript/test/e2e/Output/publication/images/9bbbcfee24b1eeadfe4cbebce3d68f37.png
diff --git a/vmap/client/javascript/test/e2e/Output/publication/images/ac9d916cef66cf3b0c6dc04361fc8c7a.png b/src/vitis/client/javascript/test/e2e/Output/publication/images/ac9d916cef66cf3b0c6dc04361fc8c7a.png
similarity index 100%
rename from vmap/client/javascript/test/e2e/Output/publication/images/ac9d916cef66cf3b0c6dc04361fc8c7a.png
rename to src/vitis/client/javascript/test/e2e/Output/publication/images/ac9d916cef66cf3b0c6dc04361fc8c7a.png
diff --git a/vmap/client/javascript/test/e2e/Output/publication/images/b9c0bafaae0a695509eb679f32d7bbc4.png b/src/vitis/client/javascript/test/e2e/Output/publication/images/b9c0bafaae0a695509eb679f32d7bbc4.png
similarity index 100%
rename from vmap/client/javascript/test/e2e/Output/publication/images/b9c0bafaae0a695509eb679f32d7bbc4.png
rename to src/vitis/client/javascript/test/e2e/Output/publication/images/b9c0bafaae0a695509eb679f32d7bbc4.png
diff --git a/vmap/client/javascript/test/e2e/Output/publication/images/b9ddfa35957bf67b37ae22b31d8d2467.png b/src/vitis/client/javascript/test/e2e/Output/publication/images/b9ddfa35957bf67b37ae22b31d8d2467.png
similarity index 100%
rename from vmap/client/javascript/test/e2e/Output/publication/images/b9ddfa35957bf67b37ae22b31d8d2467.png
rename to src/vitis/client/javascript/test/e2e/Output/publication/images/b9ddfa35957bf67b37ae22b31d8d2467.png
diff --git a/vmap/client/javascript/test/e2e/Output/publication/images/c4beb465fd449624d359f3471d6ee4c1.png b/src/vitis/client/javascript/test/e2e/Output/publication/images/c4beb465fd449624d359f3471d6ee4c1.png
similarity index 100%
rename from vmap/client/javascript/test/e2e/Output/publication/images/c4beb465fd449624d359f3471d6ee4c1.png
rename to src/vitis/client/javascript/test/e2e/Output/publication/images/c4beb465fd449624d359f3471d6ee4c1.png
diff --git a/vmap/client/javascript/test/e2e/Output/publication/images/d044896b4c0e135963e4cc03d2381d56.png b/src/vitis/client/javascript/test/e2e/Output/publication/images/d044896b4c0e135963e4cc03d2381d56.png
similarity index 100%
rename from vmap/client/javascript/test/e2e/Output/publication/images/d044896b4c0e135963e4cc03d2381d56.png
rename to src/vitis/client/javascript/test/e2e/Output/publication/images/d044896b4c0e135963e4cc03d2381d56.png
diff --git a/vmap/client/javascript/test/e2e/Output/publication/images/e0eec7bfffe9f6b747cb85db357889a0.png b/src/vitis/client/javascript/test/e2e/Output/publication/images/e0eec7bfffe9f6b747cb85db357889a0.png
similarity index 100%
rename from vmap/client/javascript/test/e2e/Output/publication/images/e0eec7bfffe9f6b747cb85db357889a0.png
rename to src/vitis/client/javascript/test/e2e/Output/publication/images/e0eec7bfffe9f6b747cb85db357889a0.png
diff --git a/vmap/client/javascript/test/e2e/Output/publication/images/e589e1728c06bfa8de1a8a9ce5a24b4d.png b/src/vitis/client/javascript/test/e2e/Output/publication/images/e589e1728c06bfa8de1a8a9ce5a24b4d.png
similarity index 100%
rename from vmap/client/javascript/test/e2e/Output/publication/images/e589e1728c06bfa8de1a8a9ce5a24b4d.png
rename to src/vitis/client/javascript/test/e2e/Output/publication/images/e589e1728c06bfa8de1a8a9ce5a24b4d.png
diff --git a/vmap/client/javascript/test/e2e/Output/publication/images/e630b1b432c5ec391a0625040a7b7ba8.png b/src/vitis/client/javascript/test/e2e/Output/publication/images/e630b1b432c5ec391a0625040a7b7ba8.png
similarity index 100%
rename from vmap/client/javascript/test/e2e/Output/publication/images/e630b1b432c5ec391a0625040a7b7ba8.png
rename to src/vitis/client/javascript/test/e2e/Output/publication/images/e630b1b432c5ec391a0625040a7b7ba8.png
diff --git a/vmap/client/javascript/test/e2e/Output/publication/images/ff2cdf03ef3a270449425608d47b23a0.png b/src/vitis/client/javascript/test/e2e/Output/publication/images/ff2cdf03ef3a270449425608d47b23a0.png
similarity index 100%
rename from vmap/client/javascript/test/e2e/Output/publication/images/ff2cdf03ef3a270449425608d47b23a0.png
rename to src/vitis/client/javascript/test/e2e/Output/publication/images/ff2cdf03ef3a270449425608d47b23a0.png
diff --git a/vmap/client/javascript/test/e2e/VeremesTest.js b/src/vitis/client/javascript/test/e2e/VeremesTest.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/VeremesTest.js
rename to src/vitis/client/javascript/test/e2e/VeremesTest.js
diff --git a/vmap/client/javascript/test/e2e/cu_vitis_abonnement.bat b/src/vitis/client/javascript/test/e2e/cu_vitis_abonnement.bat
similarity index 100%
rename from vmap/client/javascript/test/e2e/cu_vitis_abonnement.bat
rename to src/vitis/client/javascript/test/e2e/cu_vitis_abonnement.bat
diff --git a/vmap/client/javascript/test/e2e/cu_vitis_ad.bat b/src/vitis/client/javascript/test/e2e/cu_vitis_ad.bat
similarity index 100%
rename from vmap/client/javascript/test/e2e/cu_vitis_ad.bat
rename to src/vitis/client/javascript/test/e2e/cu_vitis_ad.bat
diff --git a/vmap/client/javascript/test/e2e/cu_vitis_categorie.bat b/src/vitis/client/javascript/test/e2e/cu_vitis_categorie.bat
similarity index 100%
rename from vmap/client/javascript/test/e2e/cu_vitis_categorie.bat
rename to src/vitis/client/javascript/test/e2e/cu_vitis_categorie.bat
diff --git a/vmap/client/javascript/test/e2e/cu_vitis_depot.bat b/src/vitis/client/javascript/test/e2e/cu_vitis_depot.bat
similarity index 100%
rename from vmap/client/javascript/test/e2e/cu_vitis_depot.bat
rename to src/vitis/client/javascript/test/e2e/cu_vitis_depot.bat
diff --git a/vmap/client/javascript/test/e2e/cu_vitis_fichiers_interdits.bat b/src/vitis/client/javascript/test/e2e/cu_vitis_fichiers_interdits.bat
similarity index 100%
rename from vmap/client/javascript/test/e2e/cu_vitis_fichiers_interdits.bat
rename to src/vitis/client/javascript/test/e2e/cu_vitis_fichiers_interdits.bat
diff --git a/vmap/client/javascript/test/e2e/cu_vitis_filter.bat b/src/vitis/client/javascript/test/e2e/cu_vitis_filter.bat
similarity index 100%
rename from vmap/client/javascript/test/e2e/cu_vitis_filter.bat
rename to src/vitis/client/javascript/test/e2e/cu_vitis_filter.bat
diff --git a/vmap/client/javascript/test/e2e/cu_vitis_formulaire.bat b/src/vitis/client/javascript/test/e2e/cu_vitis_formulaire.bat
similarity index 100%
rename from vmap/client/javascript/test/e2e/cu_vitis_formulaire.bat
rename to src/vitis/client/javascript/test/e2e/cu_vitis_formulaire.bat
diff --git a/vmap/client/javascript/test/e2e/cu_vitis_import_export.bat b/src/vitis/client/javascript/test/e2e/cu_vitis_import_export.bat
similarity index 100%
rename from vmap/client/javascript/test/e2e/cu_vitis_import_export.bat
rename to src/vitis/client/javascript/test/e2e/cu_vitis_import_export.bat
diff --git a/vmap/client/javascript/test/e2e/cu_vitis_ip.bat b/src/vitis/client/javascript/test/e2e/cu_vitis_ip.bat
similarity index 100%
rename from vmap/client/javascript/test/e2e/cu_vitis_ip.bat
rename to src/vitis/client/javascript/test/e2e/cu_vitis_ip.bat
diff --git a/vmap/client/javascript/test/e2e/cu_vitis_lot.bat b/src/vitis/client/javascript/test/e2e/cu_vitis_lot.bat
similarity index 100%
rename from vmap/client/javascript/test/e2e/cu_vitis_lot.bat
rename to src/vitis/client/javascript/test/e2e/cu_vitis_lot.bat
diff --git a/vmap/client/javascript/test/e2e/cu_vitis_metadata.bat b/src/vitis/client/javascript/test/e2e/cu_vitis_metadata.bat
similarity index 100%
rename from vmap/client/javascript/test/e2e/cu_vitis_metadata.bat
rename to src/vitis/client/javascript/test/e2e/cu_vitis_metadata.bat
diff --git a/vmap/client/javascript/test/e2e/cu_vitis_moteurs.bat b/src/vitis/client/javascript/test/e2e/cu_vitis_moteurs.bat
similarity index 100%
rename from vmap/client/javascript/test/e2e/cu_vitis_moteurs.bat
rename to src/vitis/client/javascript/test/e2e/cu_vitis_moteurs.bat
diff --git a/vmap/client/javascript/test/e2e/cu_vitis_order.bat b/src/vitis/client/javascript/test/e2e/cu_vitis_order.bat
similarity index 100%
rename from vmap/client/javascript/test/e2e/cu_vitis_order.bat
rename to src/vitis/client/javascript/test/e2e/cu_vitis_order.bat
diff --git a/vmap/client/javascript/test/e2e/cu_vitis_publication.bat b/src/vitis/client/javascript/test/e2e/cu_vitis_publication.bat
similarity index 100%
rename from vmap/client/javascript/test/e2e/cu_vitis_publication.bat
rename to src/vitis/client/javascript/test/e2e/cu_vitis_publication.bat
diff --git a/vmap/client/javascript/test/e2e/cu_vitis_unicite.bat b/src/vitis/client/javascript/test/e2e/cu_vitis_unicite.bat
similarity index 100%
rename from vmap/client/javascript/test/e2e/cu_vitis_unicite.bat
rename to src/vitis/client/javascript/test/e2e/cu_vitis_unicite.bat
diff --git a/vmap/client/javascript/test/e2e/cu_vitis_upload.bat b/src/vitis/client/javascript/test/e2e/cu_vitis_upload.bat
similarity index 100%
rename from vmap/client/javascript/test/e2e/cu_vitis_upload.bat
rename to src/vitis/client/javascript/test/e2e/cu_vitis_upload.bat
diff --git a/vmap/client/javascript/test/e2e/cu_vitis_upload_fmw.bat b/src/vitis/client/javascript/test/e2e/cu_vitis_upload_fmw.bat
similarity index 100%
rename from vmap/client/javascript/test/e2e/cu_vitis_upload_fmw.bat
rename to src/vitis/client/javascript/test/e2e/cu_vitis_upload_fmw.bat
diff --git a/vmap/client/javascript/test/e2e/cu_vitis_upload_zip.bat b/src/vitis/client/javascript/test/e2e/cu_vitis_upload_zip.bat
similarity index 100%
rename from vmap/client/javascript/test/e2e/cu_vitis_upload_zip.bat
rename to src/vitis/client/javascript/test/e2e/cu_vitis_upload_zip.bat
diff --git a/vmap/client/javascript/test/e2e/cu_vitis_user_existant.bat b/src/vitis/client/javascript/test/e2e/cu_vitis_user_existant.bat
similarity index 100%
rename from vmap/client/javascript/test/e2e/cu_vitis_user_existant.bat
rename to src/vitis/client/javascript/test/e2e/cu_vitis_user_existant.bat
diff --git a/vmap/client/javascript/test/e2e/cu_vitis_users.bat b/src/vitis/client/javascript/test/e2e/cu_vitis_users.bat
similarity index 100%
rename from vmap/client/javascript/test/e2e/cu_vitis_users.bat
rename to src/vitis/client/javascript/test/e2e/cu_vitis_users.bat
diff --git a/vmap/client/javascript/test/e2e/cu_vitis_users_linux.bat b/src/vitis/client/javascript/test/e2e/cu_vitis_users_linux.bat
similarity index 100%
rename from vmap/client/javascript/test/e2e/cu_vitis_users_linux.bat
rename to src/vitis/client/javascript/test/e2e/cu_vitis_users_linux.bat
diff --git a/vmap/client/javascript/test/e2e/cu_vitis_users_speciaux.bat b/src/vitis/client/javascript/test/e2e/cu_vitis_users_speciaux.bat
similarity index 100%
rename from vmap/client/javascript/test/e2e/cu_vitis_users_speciaux.bat
rename to src/vitis/client/javascript/test/e2e/cu_vitis_users_speciaux.bat
diff --git a/vmap/client/javascript/test/e2e/cu_vitis_verrouillage_projet.bat b/src/vitis/client/javascript/test/e2e/cu_vitis_verrouillage_projet.bat
similarity index 100%
rename from vmap/client/javascript/test/e2e/cu_vitis_verrouillage_projet.bat
rename to src/vitis/client/javascript/test/e2e/cu_vitis_verrouillage_projet.bat
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/.npmignore b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/.npmignore
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/.npmignore
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/.npmignore
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/README.md b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/README.md
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/README.md
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/README.md
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/index.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/index.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/index.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/index.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/.bin/mkdirp b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/.bin/mkdirp
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/.bin/mkdirp
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/.bin/mkdirp
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/.bin/mkdirp.cmd b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/.bin/mkdirp.cmd
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/.bin/mkdirp.cmd
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/.bin/mkdirp.cmd
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/hat/README.markdown b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/hat/README.markdown
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/hat/README.markdown
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/hat/README.markdown
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/hat/example/hat.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/hat/example/hat.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/hat/example/hat.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/hat/example/hat.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/hat/example/rack.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/hat/example/rack.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/hat/example/rack.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/hat/example/rack.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/hat/index.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/hat/index.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/hat/index.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/hat/index.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/hat/package.json b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/hat/package.json
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/hat/package.json
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/hat/package.json
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/hat/test/id.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/hat/test/id.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/hat/test/id.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/hat/test/id.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/hat/test/rack.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/hat/test/rack.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/hat/test/rack.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/hat/test/rack.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/LICENSE b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/LICENSE
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/LICENSE
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/LICENSE
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/README.md b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/README.md
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/README.md
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/README.md
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/chunk.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/chunk.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/chunk.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/chunk.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/compact.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/compact.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/compact.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/compact.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/difference.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/difference.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/difference.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/difference.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/drop.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/drop.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/drop.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/drop.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/dropRight.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/dropRight.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/dropRight.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/dropRight.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/dropRightWhile.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/dropRightWhile.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/dropRightWhile.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/dropRightWhile.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/dropWhile.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/dropWhile.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/dropWhile.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/dropWhile.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/fill.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/fill.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/fill.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/fill.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/findIndex.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/findIndex.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/findIndex.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/findIndex.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/findLastIndex.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/findLastIndex.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/findLastIndex.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/findLastIndex.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/first.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/first.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/first.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/first.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/flatten.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/flatten.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/flatten.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/flatten.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/flattenDeep.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/flattenDeep.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/flattenDeep.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/flattenDeep.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/head.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/head.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/head.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/head.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/indexOf.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/indexOf.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/indexOf.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/indexOf.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/initial.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/initial.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/initial.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/initial.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/intersection.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/intersection.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/intersection.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/intersection.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/last.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/last.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/last.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/last.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/lastIndexOf.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/lastIndexOf.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/lastIndexOf.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/lastIndexOf.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/object.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/object.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/object.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/object.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/pull.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/pull.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/pull.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/pull.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/pullAt.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/pullAt.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/pullAt.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/pullAt.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/remove.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/remove.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/remove.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/remove.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/rest.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/rest.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/rest.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/rest.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/slice.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/slice.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/slice.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/slice.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/sortedIndex.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/sortedIndex.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/sortedIndex.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/sortedIndex.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/sortedLastIndex.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/sortedLastIndex.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/sortedLastIndex.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/sortedLastIndex.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/tail.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/tail.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/tail.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/tail.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/take.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/take.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/take.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/take.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/takeRight.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/takeRight.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/takeRight.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/takeRight.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/takeRightWhile.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/takeRightWhile.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/takeRightWhile.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/takeRightWhile.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/takeWhile.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/takeWhile.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/takeWhile.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/takeWhile.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/union.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/union.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/union.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/union.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/uniq.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/uniq.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/uniq.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/uniq.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/unique.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/unique.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/unique.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/unique.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/unzip.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/unzip.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/unzip.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/unzip.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/unzipWith.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/unzipWith.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/unzipWith.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/unzipWith.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/without.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/without.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/without.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/without.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/xor.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/xor.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/xor.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/xor.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/zip.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/zip.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/zip.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/zip.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/zipObject.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/zipObject.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/zipObject.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/zipObject.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/zipWith.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/zipWith.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/zipWith.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/array/zipWith.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/chain.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/chain.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/chain.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/chain.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/commit.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/commit.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/commit.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/commit.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/concat.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/concat.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/concat.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/concat.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/lodash.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/lodash.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/lodash.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/lodash.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/plant.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/plant.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/plant.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/plant.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/reverse.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/reverse.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/reverse.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/reverse.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/run.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/run.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/run.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/run.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/tap.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/tap.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/tap.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/tap.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/thru.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/thru.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/thru.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/thru.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/toJSON.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/toJSON.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/toJSON.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/toJSON.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/toString.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/toString.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/toString.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/toString.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/value.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/value.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/value.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/value.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/valueOf.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/valueOf.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/valueOf.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/valueOf.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/wrapperChain.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/wrapperChain.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/wrapperChain.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/wrapperChain.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/wrapperCommit.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/wrapperCommit.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/wrapperCommit.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/wrapperCommit.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/wrapperConcat.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/wrapperConcat.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/wrapperConcat.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/wrapperConcat.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/wrapperPlant.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/wrapperPlant.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/wrapperPlant.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/wrapperPlant.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/wrapperReverse.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/wrapperReverse.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/wrapperReverse.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/wrapperReverse.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/wrapperToString.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/wrapperToString.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/wrapperToString.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/wrapperToString.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/wrapperValue.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/wrapperValue.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/wrapperValue.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/chain/wrapperValue.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/all.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/all.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/all.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/all.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/any.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/any.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/any.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/any.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/at.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/at.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/at.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/at.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/collect.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/collect.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/collect.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/collect.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/contains.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/contains.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/contains.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/contains.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/countBy.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/countBy.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/countBy.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/countBy.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/detect.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/detect.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/detect.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/detect.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/each.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/each.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/each.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/each.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/eachRight.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/eachRight.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/eachRight.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/eachRight.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/every.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/every.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/every.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/every.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/filter.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/filter.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/filter.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/filter.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/find.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/find.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/find.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/find.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/findLast.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/findLast.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/findLast.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/findLast.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/findWhere.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/findWhere.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/findWhere.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/findWhere.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/foldl.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/foldl.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/foldl.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/foldl.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/foldr.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/foldr.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/foldr.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/foldr.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/forEach.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/forEach.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/forEach.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/forEach.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/forEachRight.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/forEachRight.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/forEachRight.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/forEachRight.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/groupBy.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/groupBy.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/groupBy.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/groupBy.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/include.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/include.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/include.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/include.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/includes.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/includes.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/includes.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/includes.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/indexBy.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/indexBy.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/indexBy.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/indexBy.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/inject.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/inject.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/inject.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/inject.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/invoke.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/invoke.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/invoke.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/invoke.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/map.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/map.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/map.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/map.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/max.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/max.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/max.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/max.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/min.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/min.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/min.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/min.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/partition.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/partition.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/partition.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/partition.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/pluck.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/pluck.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/pluck.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/pluck.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/reduce.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/reduce.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/reduce.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/reduce.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/reduceRight.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/reduceRight.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/reduceRight.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/reduceRight.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/reject.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/reject.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/reject.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/reject.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/sample.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/sample.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/sample.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/sample.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/select.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/select.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/select.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/select.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/shuffle.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/shuffle.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/shuffle.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/shuffle.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/size.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/size.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/size.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/size.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/some.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/some.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/some.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/some.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/sortBy.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/sortBy.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/sortBy.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/sortBy.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/sortByAll.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/sortByAll.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/sortByAll.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/sortByAll.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/sortByOrder.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/sortByOrder.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/sortByOrder.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/sortByOrder.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/sum.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/sum.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/sum.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/sum.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/where.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/where.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/where.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/collection/where.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/date.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/date.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/date.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/date.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/date/now.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/date/now.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/date/now.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/date/now.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/after.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/after.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/after.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/after.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/ary.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/ary.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/ary.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/ary.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/backflow.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/backflow.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/backflow.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/backflow.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/before.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/before.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/before.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/before.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/bind.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/bind.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/bind.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/bind.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/bindAll.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/bindAll.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/bindAll.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/bindAll.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/bindKey.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/bindKey.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/bindKey.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/bindKey.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/compose.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/compose.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/compose.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/compose.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/curry.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/curry.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/curry.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/curry.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/curryRight.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/curryRight.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/curryRight.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/curryRight.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/debounce.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/debounce.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/debounce.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/debounce.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/defer.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/defer.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/defer.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/defer.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/delay.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/delay.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/delay.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/delay.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/flow.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/flow.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/flow.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/flow.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/flowRight.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/flowRight.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/flowRight.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/flowRight.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/memoize.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/memoize.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/memoize.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/memoize.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/modArgs.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/modArgs.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/modArgs.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/modArgs.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/negate.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/negate.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/negate.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/negate.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/once.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/once.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/once.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/once.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/partial.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/partial.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/partial.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/partial.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/partialRight.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/partialRight.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/partialRight.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/partialRight.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/rearg.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/rearg.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/rearg.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/rearg.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/restParam.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/restParam.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/restParam.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/restParam.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/spread.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/spread.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/spread.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/spread.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/throttle.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/throttle.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/throttle.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/throttle.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/wrap.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/wrap.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/wrap.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/function/wrap.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/index.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/index.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/index.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/index.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/LazyWrapper.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/LazyWrapper.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/LazyWrapper.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/LazyWrapper.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/LodashWrapper.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/LodashWrapper.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/LodashWrapper.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/LodashWrapper.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/MapCache.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/MapCache.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/MapCache.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/MapCache.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/SetCache.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/SetCache.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/SetCache.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/SetCache.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayConcat.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayConcat.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayConcat.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayConcat.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayCopy.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayCopy.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayCopy.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayCopy.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayEach.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayEach.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayEach.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayEach.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayEachRight.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayEachRight.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayEachRight.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayEachRight.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayEvery.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayEvery.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayEvery.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayEvery.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayExtremum.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayExtremum.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayExtremum.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayExtremum.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayFilter.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayFilter.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayFilter.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayFilter.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayMap.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayMap.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayMap.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayMap.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayPush.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayPush.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayPush.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayPush.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayReduce.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayReduce.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayReduce.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayReduce.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayReduceRight.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayReduceRight.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayReduceRight.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arrayReduceRight.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arraySome.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arraySome.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arraySome.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arraySome.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arraySum.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arraySum.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arraySum.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/arraySum.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/assignDefaults.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/assignDefaults.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/assignDefaults.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/assignDefaults.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/assignOwnDefaults.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/assignOwnDefaults.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/assignOwnDefaults.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/assignOwnDefaults.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/assignWith.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/assignWith.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/assignWith.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/assignWith.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseAssign.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseAssign.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseAssign.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseAssign.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseAt.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseAt.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseAt.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseAt.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseCallback.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseCallback.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseCallback.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseCallback.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseClone.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseClone.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseClone.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseClone.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseCompareAscending.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseCompareAscending.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseCompareAscending.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseCompareAscending.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseCopy.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseCopy.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseCopy.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseCopy.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseCreate.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseCreate.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseCreate.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseCreate.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseDelay.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseDelay.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseDelay.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseDelay.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseDifference.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseDifference.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseDifference.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseDifference.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseEach.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseEach.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseEach.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseEach.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseEachRight.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseEachRight.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseEachRight.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseEachRight.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseEvery.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseEvery.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseEvery.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseEvery.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseExtremum.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseExtremum.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseExtremum.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseExtremum.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseFill.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseFill.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseFill.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseFill.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseFilter.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseFilter.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseFilter.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseFilter.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseFind.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseFind.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseFind.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseFind.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseFindIndex.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseFindIndex.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseFindIndex.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseFindIndex.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseFlatten.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseFlatten.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseFlatten.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseFlatten.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseFor.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseFor.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseFor.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseFor.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseForIn.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseForIn.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseForIn.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseForIn.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseForOwn.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseForOwn.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseForOwn.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseForOwn.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseForOwnRight.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseForOwnRight.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseForOwnRight.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseForOwnRight.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseForRight.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseForRight.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseForRight.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseForRight.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseFunctions.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseFunctions.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseFunctions.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseFunctions.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseGet.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseGet.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseGet.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseGet.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseIndexOf.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseIndexOf.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseIndexOf.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseIndexOf.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseIsEqual.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseIsEqual.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseIsEqual.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseIsEqual.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseIsEqualDeep.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseIsEqualDeep.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseIsEqualDeep.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseIsEqualDeep.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseIsFunction.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseIsFunction.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseIsFunction.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseIsFunction.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseIsMatch.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseIsMatch.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseIsMatch.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseIsMatch.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseLodash.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseLodash.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseLodash.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseLodash.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseMap.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseMap.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseMap.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseMap.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseMatches.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseMatches.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseMatches.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseMatches.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseMatchesProperty.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseMatchesProperty.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseMatchesProperty.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseMatchesProperty.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseMerge.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseMerge.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseMerge.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseMerge.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseMergeDeep.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseMergeDeep.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseMergeDeep.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseMergeDeep.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseProperty.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseProperty.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseProperty.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseProperty.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/basePropertyDeep.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/basePropertyDeep.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/basePropertyDeep.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/basePropertyDeep.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/basePullAt.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/basePullAt.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/basePullAt.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/basePullAt.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseRandom.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseRandom.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseRandom.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseRandom.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseReduce.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseReduce.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseReduce.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseReduce.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseSetData.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseSetData.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseSetData.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseSetData.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseSlice.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseSlice.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseSlice.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseSlice.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseSome.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseSome.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseSome.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseSome.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseSortBy.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseSortBy.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseSortBy.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseSortBy.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseSortByOrder.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseSortByOrder.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseSortByOrder.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseSortByOrder.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseSum.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseSum.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseSum.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseSum.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseToString.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseToString.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseToString.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseToString.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseUniq.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseUniq.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseUniq.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseUniq.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseValues.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseValues.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseValues.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseValues.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseWhile.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseWhile.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseWhile.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseWhile.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseWrapperValue.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseWrapperValue.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseWrapperValue.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/baseWrapperValue.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/binaryIndex.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/binaryIndex.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/binaryIndex.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/binaryIndex.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/binaryIndexBy.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/binaryIndexBy.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/binaryIndexBy.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/binaryIndexBy.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/bindCallback.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/bindCallback.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/bindCallback.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/bindCallback.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/bufferClone.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/bufferClone.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/bufferClone.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/bufferClone.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/cacheIndexOf.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/cacheIndexOf.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/cacheIndexOf.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/cacheIndexOf.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/cachePush.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/cachePush.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/cachePush.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/cachePush.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/charsLeftIndex.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/charsLeftIndex.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/charsLeftIndex.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/charsLeftIndex.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/charsRightIndex.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/charsRightIndex.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/charsRightIndex.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/charsRightIndex.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/compareAscending.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/compareAscending.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/compareAscending.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/compareAscending.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/compareMultiple.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/compareMultiple.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/compareMultiple.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/compareMultiple.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/composeArgs.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/composeArgs.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/composeArgs.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/composeArgs.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/composeArgsRight.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/composeArgsRight.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/composeArgsRight.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/composeArgsRight.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createAggregator.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createAggregator.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createAggregator.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createAggregator.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createAssigner.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createAssigner.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createAssigner.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createAssigner.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createBaseEach.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createBaseEach.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createBaseEach.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createBaseEach.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createBaseFor.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createBaseFor.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createBaseFor.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createBaseFor.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createBindWrapper.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createBindWrapper.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createBindWrapper.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createBindWrapper.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createCache.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createCache.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createCache.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createCache.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createCompounder.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createCompounder.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createCompounder.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createCompounder.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createCtorWrapper.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createCtorWrapper.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createCtorWrapper.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createCtorWrapper.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createCurry.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createCurry.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createCurry.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createCurry.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createDefaults.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createDefaults.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createDefaults.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createDefaults.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createExtremum.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createExtremum.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createExtremum.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createExtremum.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createFind.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createFind.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createFind.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createFind.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createFindIndex.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createFindIndex.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createFindIndex.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createFindIndex.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createFindKey.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createFindKey.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createFindKey.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createFindKey.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createFlow.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createFlow.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createFlow.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createFlow.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createForEach.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createForEach.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createForEach.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createForEach.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createForIn.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createForIn.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createForIn.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createForIn.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createForOwn.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createForOwn.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createForOwn.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createForOwn.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createHybridWrapper.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createHybridWrapper.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createHybridWrapper.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createHybridWrapper.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createObjectMapper.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createObjectMapper.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createObjectMapper.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createObjectMapper.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createPadDir.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createPadDir.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createPadDir.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createPadDir.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createPadding.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createPadding.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createPadding.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createPadding.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createPartial.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createPartial.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createPartial.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createPartial.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createPartialWrapper.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createPartialWrapper.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createPartialWrapper.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createPartialWrapper.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createReduce.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createReduce.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createReduce.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createReduce.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createRound.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createRound.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createRound.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createRound.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createSortedIndex.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createSortedIndex.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createSortedIndex.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createSortedIndex.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createWrapper.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createWrapper.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createWrapper.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/createWrapper.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/deburrLetter.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/deburrLetter.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/deburrLetter.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/deburrLetter.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/equalArrays.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/equalArrays.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/equalArrays.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/equalArrays.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/equalByTag.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/equalByTag.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/equalByTag.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/equalByTag.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/equalObjects.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/equalObjects.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/equalObjects.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/equalObjects.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/escapeHtmlChar.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/escapeHtmlChar.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/escapeHtmlChar.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/escapeHtmlChar.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/escapeRegExpChar.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/escapeRegExpChar.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/escapeRegExpChar.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/escapeRegExpChar.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/escapeStringChar.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/escapeStringChar.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/escapeStringChar.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/escapeStringChar.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/getData.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/getData.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/getData.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/getData.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/getFuncName.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/getFuncName.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/getFuncName.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/getFuncName.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/getLength.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/getLength.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/getLength.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/getLength.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/getMatchData.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/getMatchData.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/getMatchData.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/getMatchData.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/getNative.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/getNative.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/getNative.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/getNative.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/getView.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/getView.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/getView.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/getView.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/indexOfNaN.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/indexOfNaN.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/indexOfNaN.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/indexOfNaN.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/initCloneArray.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/initCloneArray.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/initCloneArray.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/initCloneArray.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/initCloneByTag.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/initCloneByTag.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/initCloneByTag.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/initCloneByTag.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/initCloneObject.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/initCloneObject.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/initCloneObject.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/initCloneObject.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/invokePath.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/invokePath.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/invokePath.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/invokePath.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isArrayLike.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isArrayLike.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isArrayLike.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isArrayLike.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isIndex.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isIndex.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isIndex.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isIndex.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isIterateeCall.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isIterateeCall.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isIterateeCall.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isIterateeCall.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isKey.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isKey.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isKey.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isKey.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isLaziable.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isLaziable.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isLaziable.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isLaziable.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isLength.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isLength.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isLength.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isLength.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isObjectLike.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isObjectLike.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isObjectLike.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isObjectLike.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isSpace.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isSpace.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isSpace.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isSpace.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isStrictComparable.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isStrictComparable.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isStrictComparable.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/isStrictComparable.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/lazyClone.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/lazyClone.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/lazyClone.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/lazyClone.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/lazyReverse.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/lazyReverse.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/lazyReverse.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/lazyReverse.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/lazyValue.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/lazyValue.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/lazyValue.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/lazyValue.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/mapDelete.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/mapDelete.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/mapDelete.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/mapDelete.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/mapGet.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/mapGet.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/mapGet.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/mapGet.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/mapHas.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/mapHas.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/mapHas.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/mapHas.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/mapSet.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/mapSet.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/mapSet.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/mapSet.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/mergeData.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/mergeData.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/mergeData.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/mergeData.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/mergeDefaults.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/mergeDefaults.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/mergeDefaults.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/mergeDefaults.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/metaMap.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/metaMap.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/metaMap.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/metaMap.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/pickByArray.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/pickByArray.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/pickByArray.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/pickByArray.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/pickByCallback.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/pickByCallback.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/pickByCallback.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/pickByCallback.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/reEscape.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/reEscape.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/reEscape.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/reEscape.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/reEvaluate.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/reEvaluate.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/reEvaluate.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/reEvaluate.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/reInterpolate.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/reInterpolate.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/reInterpolate.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/reInterpolate.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/realNames.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/realNames.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/realNames.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/realNames.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/reorder.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/reorder.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/reorder.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/reorder.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/replaceHolders.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/replaceHolders.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/replaceHolders.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/replaceHolders.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/setData.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/setData.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/setData.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/setData.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/shimKeys.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/shimKeys.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/shimKeys.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/shimKeys.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/sortedUniq.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/sortedUniq.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/sortedUniq.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/sortedUniq.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/toIterable.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/toIterable.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/toIterable.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/toIterable.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/toObject.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/toObject.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/toObject.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/toObject.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/toPath.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/toPath.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/toPath.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/toPath.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/trimmedLeftIndex.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/trimmedLeftIndex.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/trimmedLeftIndex.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/trimmedLeftIndex.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/trimmedRightIndex.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/trimmedRightIndex.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/trimmedRightIndex.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/trimmedRightIndex.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/unescapeHtmlChar.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/unescapeHtmlChar.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/unescapeHtmlChar.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/unescapeHtmlChar.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/wrapperClone.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/wrapperClone.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/wrapperClone.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/internal/wrapperClone.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/clone.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/clone.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/clone.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/clone.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/cloneDeep.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/cloneDeep.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/cloneDeep.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/cloneDeep.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/eq.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/eq.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/eq.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/eq.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/gt.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/gt.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/gt.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/gt.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/gte.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/gte.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/gte.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/gte.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isArguments.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isArguments.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isArguments.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isArguments.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isArray.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isArray.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isArray.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isArray.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isBoolean.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isBoolean.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isBoolean.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isBoolean.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isDate.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isDate.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isDate.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isDate.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isElement.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isElement.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isElement.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isElement.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isEmpty.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isEmpty.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isEmpty.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isEmpty.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isEqual.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isEqual.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isEqual.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isEqual.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isError.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isError.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isError.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isError.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isFinite.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isFinite.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isFinite.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isFinite.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isFunction.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isFunction.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isFunction.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isFunction.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isMatch.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isMatch.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isMatch.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isMatch.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isNaN.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isNaN.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isNaN.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isNaN.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isNative.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isNative.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isNative.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isNative.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isNull.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isNull.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isNull.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isNull.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isNumber.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isNumber.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isNumber.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isNumber.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isObject.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isObject.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isObject.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isObject.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isPlainObject.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isPlainObject.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isPlainObject.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isPlainObject.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isRegExp.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isRegExp.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isRegExp.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isRegExp.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isString.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isString.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isString.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isString.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isTypedArray.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isTypedArray.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isTypedArray.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isTypedArray.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isUndefined.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isUndefined.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isUndefined.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/isUndefined.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/lt.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/lt.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/lt.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/lt.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/lte.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/lte.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/lte.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/lte.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/toArray.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/toArray.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/toArray.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/toArray.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/toPlainObject.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/toPlainObject.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/toPlainObject.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/lang/toPlainObject.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math/add.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math/add.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math/add.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math/add.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math/ceil.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math/ceil.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math/ceil.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math/ceil.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math/floor.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math/floor.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math/floor.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math/floor.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math/max.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math/max.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math/max.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math/max.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math/min.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math/min.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math/min.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math/min.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math/round.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math/round.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math/round.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math/round.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math/sum.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math/sum.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math/sum.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/math/sum.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/number.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/number.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/number.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/number.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/number/inRange.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/number/inRange.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/number/inRange.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/number/inRange.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/number/random.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/number/random.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/number/random.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/number/random.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/assign.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/assign.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/assign.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/assign.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/create.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/create.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/create.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/create.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/defaults.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/defaults.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/defaults.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/defaults.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/defaultsDeep.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/defaultsDeep.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/defaultsDeep.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/defaultsDeep.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/extend.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/extend.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/extend.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/extend.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/findKey.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/findKey.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/findKey.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/findKey.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/findLastKey.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/findLastKey.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/findLastKey.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/findLastKey.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/forIn.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/forIn.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/forIn.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/forIn.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/forInRight.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/forInRight.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/forInRight.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/forInRight.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/forOwn.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/forOwn.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/forOwn.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/forOwn.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/forOwnRight.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/forOwnRight.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/forOwnRight.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/forOwnRight.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/functions.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/functions.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/functions.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/functions.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/get.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/get.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/get.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/get.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/has.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/has.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/has.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/has.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/invert.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/invert.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/invert.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/invert.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/keys.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/keys.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/keys.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/keys.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/keysIn.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/keysIn.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/keysIn.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/keysIn.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/mapKeys.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/mapKeys.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/mapKeys.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/mapKeys.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/mapValues.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/mapValues.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/mapValues.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/mapValues.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/merge.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/merge.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/merge.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/merge.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/methods.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/methods.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/methods.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/methods.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/omit.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/omit.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/omit.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/omit.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/pairs.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/pairs.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/pairs.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/pairs.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/pick.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/pick.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/pick.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/pick.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/result.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/result.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/result.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/result.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/set.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/set.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/set.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/set.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/transform.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/transform.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/transform.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/transform.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/values.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/values.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/values.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/values.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/valuesIn.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/valuesIn.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/valuesIn.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/object/valuesIn.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/package.json b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/package.json
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/package.json
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/package.json
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/camelCase.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/camelCase.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/camelCase.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/camelCase.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/capitalize.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/capitalize.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/capitalize.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/capitalize.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/deburr.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/deburr.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/deburr.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/deburr.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/endsWith.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/endsWith.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/endsWith.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/endsWith.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/escape.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/escape.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/escape.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/escape.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/escapeRegExp.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/escapeRegExp.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/escapeRegExp.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/escapeRegExp.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/kebabCase.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/kebabCase.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/kebabCase.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/kebabCase.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/pad.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/pad.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/pad.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/pad.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/padLeft.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/padLeft.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/padLeft.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/padLeft.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/padRight.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/padRight.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/padRight.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/padRight.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/parseInt.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/parseInt.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/parseInt.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/parseInt.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/repeat.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/repeat.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/repeat.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/repeat.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/snakeCase.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/snakeCase.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/snakeCase.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/snakeCase.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/startCase.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/startCase.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/startCase.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/startCase.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/startsWith.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/startsWith.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/startsWith.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/startsWith.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/template.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/template.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/template.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/template.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/templateSettings.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/templateSettings.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/templateSettings.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/templateSettings.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/trim.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/trim.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/trim.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/trim.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/trimLeft.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/trimLeft.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/trimLeft.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/trimLeft.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/trimRight.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/trimRight.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/trimRight.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/trimRight.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/trunc.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/trunc.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/trunc.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/trunc.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/unescape.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/unescape.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/unescape.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/unescape.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/words.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/words.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/words.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/string/words.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/support.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/support.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/support.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/support.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/attempt.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/attempt.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/attempt.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/attempt.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/callback.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/callback.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/callback.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/callback.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/constant.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/constant.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/constant.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/constant.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/identity.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/identity.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/identity.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/identity.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/iteratee.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/iteratee.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/iteratee.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/iteratee.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/matches.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/matches.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/matches.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/matches.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/matchesProperty.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/matchesProperty.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/matchesProperty.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/matchesProperty.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/method.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/method.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/method.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/method.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/methodOf.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/methodOf.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/methodOf.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/methodOf.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/mixin.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/mixin.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/mixin.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/mixin.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/noop.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/noop.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/noop.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/noop.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/property.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/property.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/property.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/property.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/propertyOf.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/propertyOf.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/propertyOf.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/propertyOf.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/range.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/range.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/range.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/range.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/times.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/times.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/times.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/times.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/uniqueId.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/uniqueId.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/uniqueId.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/lodash/utility/uniqueId.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/.travis.yml b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/.travis.yml
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/.travis.yml
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/.travis.yml
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/LICENSE b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/LICENSE
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/LICENSE
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/LICENSE
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/bin/cmd.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/bin/cmd.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/bin/cmd.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/bin/cmd.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/bin/usage.txt b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/bin/usage.txt
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/bin/usage.txt
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/bin/usage.txt
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/examples/pow.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/examples/pow.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/examples/pow.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/examples/pow.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/index.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/index.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/index.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/index.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/.travis.yml b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/.travis.yml
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/.travis.yml
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/.travis.yml
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/LICENSE b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/LICENSE
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/LICENSE
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/LICENSE
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/example/parse.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/example/parse.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/example/parse.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/example/parse.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/index.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/index.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/index.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/index.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/package.json b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/package.json
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/package.json
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/package.json
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/readme.markdown b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/readme.markdown
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/readme.markdown
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/readme.markdown
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/dash.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/dash.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/dash.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/dash.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/default_bool.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/default_bool.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/default_bool.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/default_bool.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/dotted.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/dotted.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/dotted.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/dotted.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/long.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/long.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/long.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/long.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/parse.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/parse.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/parse.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/parse.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/parse_modified.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/parse_modified.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/parse_modified.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/parse_modified.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/short.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/short.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/short.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/short.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/whitespace.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/whitespace.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/whitespace.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/node_modules/minimist/test/whitespace.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/package.json b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/package.json
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/package.json
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/package.json
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/readme.markdown b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/readme.markdown
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/readme.markdown
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/readme.markdown
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/chmod.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/chmod.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/chmod.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/chmod.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/clobber.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/clobber.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/clobber.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/clobber.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/mkdirp.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/mkdirp.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/mkdirp.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/mkdirp.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/opts_fs.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/opts_fs.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/opts_fs.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/opts_fs.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/opts_fs_sync.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/opts_fs_sync.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/opts_fs_sync.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/opts_fs_sync.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/perm.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/perm.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/perm.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/perm.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/perm_sync.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/perm_sync.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/perm_sync.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/perm_sync.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/race.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/race.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/race.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/race.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/rel.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/rel.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/rel.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/rel.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/return.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/return.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/return.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/return.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/return_sync.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/return_sync.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/return_sync.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/return_sync.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/root.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/root.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/root.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/root.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/sync.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/sync.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/sync.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/sync.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/umask.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/umask.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/umask.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/umask.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/umask_sync.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/umask_sync.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/umask_sync.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/mkdirp/test/umask_sync.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/string.prototype.startswith/LICENSE-MIT.txt b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/string.prototype.startswith/LICENSE-MIT.txt
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/string.prototype.startswith/LICENSE-MIT.txt
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/string.prototype.startswith/LICENSE-MIT.txt
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/string.prototype.startswith/README.md b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/string.prototype.startswith/README.md
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/string.prototype.startswith/README.md
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/string.prototype.startswith/README.md
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/string.prototype.startswith/package.json b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/string.prototype.startswith/package.json
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/string.prototype.startswith/package.json
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/string.prototype.startswith/package.json
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/string.prototype.startswith/startswith.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/string.prototype.startswith/startswith.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/string.prototype.startswith/startswith.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/node_modules/string.prototype.startswith/startswith.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/package.json b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/package.json
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/package.json
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/package.json
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/protractor.config.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/protractor.config.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/protractor.config.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/protractor.config.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/template.html b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/template.html
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/template.html
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/template.html
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/test/test2Spec.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/test/test2Spec.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/test/test2Spec.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/test/test2Spec.js
diff --git a/vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/test/testSpec.js b/src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/test/testSpec.js
similarity index 100%
rename from vmap/client/modules/vmap/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/test/testSpec.js
rename to src/vitis/client/javascript/test/e2e/node_module/protractor-jasmine2-html-reporter/test/testSpec.js
diff --git a/vmap/client/javascript/test/e2e/protractor.conf.abonnement.js b/src/vitis/client/javascript/test/e2e/protractor.conf.abonnement.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/protractor.conf.abonnement.js
rename to src/vitis/client/javascript/test/e2e/protractor.conf.abonnement.js
diff --git a/vmap/client/javascript/test/e2e/protractor.conf.ad.js b/src/vitis/client/javascript/test/e2e/protractor.conf.ad.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/protractor.conf.ad.js
rename to src/vitis/client/javascript/test/e2e/protractor.conf.ad.js
diff --git a/vmap/client/javascript/test/e2e/protractor.conf.categorie.js b/src/vitis/client/javascript/test/e2e/protractor.conf.categorie.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/protractor.conf.categorie.js
rename to src/vitis/client/javascript/test/e2e/protractor.conf.categorie.js
diff --git a/vmap/client/javascript/test/e2e/protractor.conf.depot.js b/src/vitis/client/javascript/test/e2e/protractor.conf.depot.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/protractor.conf.depot.js
rename to src/vitis/client/javascript/test/e2e/protractor.conf.depot.js
diff --git a/vmap/client/javascript/test/e2e/protractor.conf.fichiers_interdits.js b/src/vitis/client/javascript/test/e2e/protractor.conf.fichiers_interdits.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/protractor.conf.fichiers_interdits.js
rename to src/vitis/client/javascript/test/e2e/protractor.conf.fichiers_interdits.js
diff --git a/vmap/client/javascript/test/e2e/protractor.conf.filter.js b/src/vitis/client/javascript/test/e2e/protractor.conf.filter.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/protractor.conf.filter.js
rename to src/vitis/client/javascript/test/e2e/protractor.conf.filter.js
diff --git a/vmap/client/javascript/test/e2e/protractor.conf.formulaire.js b/src/vitis/client/javascript/test/e2e/protractor.conf.formulaire.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/protractor.conf.formulaire.js
rename to src/vitis/client/javascript/test/e2e/protractor.conf.formulaire.js
diff --git a/vmap/client/javascript/test/e2e/protractor.conf.import.export.js b/src/vitis/client/javascript/test/e2e/protractor.conf.import.export.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/protractor.conf.import.export.js
rename to src/vitis/client/javascript/test/e2e/protractor.conf.import.export.js
diff --git a/vmap/client/javascript/test/e2e/protractor.conf.ip.js b/src/vitis/client/javascript/test/e2e/protractor.conf.ip.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/protractor.conf.ip.js
rename to src/vitis/client/javascript/test/e2e/protractor.conf.ip.js
diff --git a/vmap/client/javascript/test/e2e/protractor.conf.js b/src/vitis/client/javascript/test/e2e/protractor.conf.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/protractor.conf.js
rename to src/vitis/client/javascript/test/e2e/protractor.conf.js
diff --git a/vmap/client/javascript/test/e2e/protractor.conf.lot.js b/src/vitis/client/javascript/test/e2e/protractor.conf.lot.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/protractor.conf.lot.js
rename to src/vitis/client/javascript/test/e2e/protractor.conf.lot.js
diff --git a/vmap/client/javascript/test/e2e/protractor.conf.metada.js b/src/vitis/client/javascript/test/e2e/protractor.conf.metada.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/protractor.conf.metada.js
rename to src/vitis/client/javascript/test/e2e/protractor.conf.metada.js
diff --git a/vmap/client/javascript/test/e2e/protractor.conf.metadata.js b/src/vitis/client/javascript/test/e2e/protractor.conf.metadata.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/protractor.conf.metadata.js
rename to src/vitis/client/javascript/test/e2e/protractor.conf.metadata.js
diff --git a/vmap/client/javascript/test/e2e/protractor.conf.moteurs.js b/src/vitis/client/javascript/test/e2e/protractor.conf.moteurs.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/protractor.conf.moteurs.js
rename to src/vitis/client/javascript/test/e2e/protractor.conf.moteurs.js
diff --git a/vmap/client/javascript/test/e2e/protractor.conf.order.js b/src/vitis/client/javascript/test/e2e/protractor.conf.order.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/protractor.conf.order.js
rename to src/vitis/client/javascript/test/e2e/protractor.conf.order.js
diff --git a/vmap/client/javascript/test/e2e/protractor.conf.publication.js b/src/vitis/client/javascript/test/e2e/protractor.conf.publication.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/protractor.conf.publication.js
rename to src/vitis/client/javascript/test/e2e/protractor.conf.publication.js
diff --git a/vmap/client/javascript/test/e2e/protractor.conf.unicite.js b/src/vitis/client/javascript/test/e2e/protractor.conf.unicite.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/protractor.conf.unicite.js
rename to src/vitis/client/javascript/test/e2e/protractor.conf.unicite.js
diff --git a/vmap/client/javascript/test/e2e/protractor.conf.upload.js b/src/vitis/client/javascript/test/e2e/protractor.conf.upload.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/protractor.conf.upload.js
rename to src/vitis/client/javascript/test/e2e/protractor.conf.upload.js
diff --git a/vmap/client/javascript/test/e2e/protractor.conf.upload_fmw.js b/src/vitis/client/javascript/test/e2e/protractor.conf.upload_fmw.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/protractor.conf.upload_fmw.js
rename to src/vitis/client/javascript/test/e2e/protractor.conf.upload_fmw.js
diff --git a/vmap/client/javascript/test/e2e/protractor.conf.upload_zip.js b/src/vitis/client/javascript/test/e2e/protractor.conf.upload_zip.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/protractor.conf.upload_zip.js
rename to src/vitis/client/javascript/test/e2e/protractor.conf.upload_zip.js
diff --git a/vmap/client/javascript/test/e2e/protractor.conf.user_existant.js b/src/vitis/client/javascript/test/e2e/protractor.conf.user_existant.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/protractor.conf.user_existant.js
rename to src/vitis/client/javascript/test/e2e/protractor.conf.user_existant.js
diff --git a/vmap/client/javascript/test/e2e/protractor.conf.users.js b/src/vitis/client/javascript/test/e2e/protractor.conf.users.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/protractor.conf.users.js
rename to src/vitis/client/javascript/test/e2e/protractor.conf.users.js
diff --git a/vmap/client/javascript/test/e2e/protractor.conf.users_speciaux.js b/src/vitis/client/javascript/test/e2e/protractor.conf.users_speciaux.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/protractor.conf.users_speciaux.js
rename to src/vitis/client/javascript/test/e2e/protractor.conf.users_speciaux.js
diff --git a/vmap/client/javascript/test/e2e/protractor.conf.users_speciaux.linux.js b/src/vitis/client/javascript/test/e2e/protractor.conf.users_speciaux.linux.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/protractor.conf.users_speciaux.linux.js
rename to src/vitis/client/javascript/test/e2e/protractor.conf.users_speciaux.linux.js
diff --git a/vmap/client/javascript/test/e2e/protractor.conf.verrouillage_projet.js b/src/vitis/client/javascript/test/e2e/protractor.conf.verrouillage_projet.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/protractor.conf.verrouillage_projet.js
rename to src/vitis/client/javascript/test/e2e/protractor.conf.verrouillage_projet.js
diff --git a/vmap/client/javascript/test/e2e/resource/DATE.gex b/src/vitis/client/javascript/test/e2e/resource/DATE.gex
similarity index 100%
rename from vmap/client/javascript/test/e2e/resource/DATE.gex
rename to src/vitis/client/javascript/test/e2e/resource/DATE.gex
diff --git a/vmap/client/javascript/test/e2e/resource/DPT.DBF b/src/vitis/client/javascript/test/e2e/resource/DPT.DBF
similarity index 100%
rename from vmap/client/javascript/test/e2e/resource/DPT.DBF
rename to src/vitis/client/javascript/test/e2e/resource/DPT.DBF
diff --git a/vmap/client/javascript/test/e2e/resource/DPT.SHP b/src/vitis/client/javascript/test/e2e/resource/DPT.SHP
similarity index 100%
rename from vmap/client/javascript/test/e2e/resource/DPT.SHP
rename to src/vitis/client/javascript/test/e2e/resource/DPT.SHP
diff --git a/vmap/client/javascript/test/e2e/resource/DPT.SHX b/src/vitis/client/javascript/test/e2e/resource/DPT.SHX
similarity index 100%
rename from vmap/client/javascript/test/e2e/resource/DPT.SHX
rename to src/vitis/client/javascript/test/e2e/resource/DPT.SHX
diff --git a/vmap/client/javascript/test/e2e/resource/DPT.prj b/src/vitis/client/javascript/test/e2e/resource/DPT.prj
similarity index 100%
rename from vmap/client/javascript/test/e2e/resource/DPT.prj
rename to src/vitis/client/javascript/test/e2e/resource/DPT.prj
diff --git a/vmap/client/javascript/test/e2e/resource/DPT.zip b/src/vitis/client/javascript/test/e2e/resource/DPT.zip
similarity index 100%
rename from vmap/client/javascript/test/e2e/resource/DPT.zip
rename to src/vitis/client/javascript/test/e2e/resource/DPT.zip
diff --git a/vmap/client/javascript/test/e2e/resource/choix_multiple.fmw b/src/vitis/client/javascript/test/e2e/resource/choix_multiple.fmw
similarity index 100%
rename from vmap/client/javascript/test/e2e/resource/choix_multiple.fmw
rename to src/vitis/client/javascript/test/e2e/resource/choix_multiple.fmw
diff --git a/vmap/client/javascript/test/e2e/resource/choix_multiple.log b/src/vitis/client/javascript/test/e2e/resource/choix_multiple.log
similarity index 100%
rename from vmap/client/javascript/test/e2e/resource/choix_multiple.log
rename to src/vitis/client/javascript/test/e2e/resource/choix_multiple.log
diff --git a/vmap/client/javascript/test/e2e/resource/controle_quali.gex b/src/vitis/client/javascript/test/e2e/resource/controle_quali.gex
similarity index 100%
rename from vmap/client/javascript/test/e2e/resource/controle_quali.gex
rename to src/vitis/client/javascript/test/e2e/resource/controle_quali.gex
diff --git a/vmap/client/javascript/test/e2e/resource/dep dep.zip b/src/vitis/client/javascript/test/e2e/resource/dep dep.zip
similarity index 100%
rename from vmap/client/javascript/test/e2e/resource/dep dep.zip
rename to src/vitis/client/javascript/test/e2e/resource/dep dep.zip
diff --git a/vmap/client/javascript/test/e2e/resource/depts.zip b/src/vitis/client/javascript/test/e2e/resource/depts.zip
similarity index 100%
rename from vmap/client/javascript/test/e2e/resource/depts.zip
rename to src/vitis/client/javascript/test/e2e/resource/depts.zip
diff --git a/vmap/client/javascript/test/e2e/resource/dpt2.dbf b/src/vitis/client/javascript/test/e2e/resource/dpt2.dbf
similarity index 100%
rename from vmap/client/javascript/test/e2e/resource/dpt2.dbf
rename to src/vitis/client/javascript/test/e2e/resource/dpt2.dbf
diff --git a/vmap/client/javascript/test/e2e/resource/dpt2.prj b/src/vitis/client/javascript/test/e2e/resource/dpt2.prj
similarity index 100%
rename from vmap/client/javascript/test/e2e/resource/dpt2.prj
rename to src/vitis/client/javascript/test/e2e/resource/dpt2.prj
diff --git a/vmap/client/javascript/test/e2e/resource/dpt2.shp b/src/vitis/client/javascript/test/e2e/resource/dpt2.shp
similarity index 100%
rename from vmap/client/javascript/test/e2e/resource/dpt2.shp
rename to src/vitis/client/javascript/test/e2e/resource/dpt2.shp
diff --git a/vmap/client/javascript/test/e2e/resource/dpt2.shx b/src/vitis/client/javascript/test/e2e/resource/dpt2.shx
similarity index 100%
rename from vmap/client/javascript/test/e2e/resource/dpt2.shx
rename to src/vitis/client/javascript/test/e2e/resource/dpt2.shx
diff --git a/vmap/client/javascript/test/e2e/resource/dpt2.zip b/src/vitis/client/javascript/test/e2e/resource/dpt2.zip
similarity index 100%
rename from vmap/client/javascript/test/e2e/resource/dpt2.zip
rename to src/vitis/client/javascript/test/e2e/resource/dpt2.zip
diff --git "a/vmap/client/javascript/test/e2e/resource/d\303\251p.zip" "b/src/vitis/client/javascript/test/e2e/resource/d\303\251p.zip"
similarity index 100%
rename from "vmap/client/javascript/test/e2e/resource/d\303\251p.zip"
rename to "src/vitis/client/javascript/test/e2e/resource/d\303\251p.zip"
diff --git a/vmap/client/javascript/test/e2e/resource/ee aa.fmw b/src/vitis/client/javascript/test/e2e/resource/ee aa.fmw
similarity index 100%
rename from vmap/client/javascript/test/e2e/resource/ee aa.fmw
rename to src/vitis/client/javascript/test/e2e/resource/ee aa.fmw
diff --git a/vmap/client/javascript/test/e2e/resource/exemples.gex b/src/vitis/client/javascript/test/e2e/resource/exemples.gex
similarity index 100%
rename from vmap/client/javascript/test/e2e/resource/exemples.gex
rename to src/vitis/client/javascript/test/e2e/resource/exemples.gex
diff --git "a/vmap/client/javascript/test/e2e/resource/extraction_geofla_par_d\303\251partement.gex" "b/src/vitis/client/javascript/test/e2e/resource/extraction_geofla_par_d\303\251partement.gex"
similarity index 100%
rename from "vmap/client/javascript/test/e2e/resource/extraction_geofla_par_d\303\251partement.gex"
rename to "src/vitis/client/javascript/test/e2e/resource/extraction_geofla_par_d\303\251partement.gex"
diff --git a/vmap/client/javascript/test/e2e/resource/import_export.gex b/src/vitis/client/javascript/test/e2e/resource/import_export.gex
similarity index 100%
rename from vmap/client/javascript/test/e2e/resource/import_export.gex
rename to src/vitis/client/javascript/test/e2e/resource/import_export.gex
diff --git a/vmap/client/javascript/test/e2e/resource/import_export2.gex b/src/vitis/client/javascript/test/e2e/resource/import_export2.gex
similarity index 100%
rename from vmap/client/javascript/test/e2e/resource/import_export2.gex
rename to src/vitis/client/javascript/test/e2e/resource/import_export2.gex
diff --git a/vmap/client/javascript/test/e2e/resource/it3/ARDECHE.dbf b/src/vitis/client/javascript/test/e2e/resource/it3/ARDECHE.dbf
similarity index 100%
rename from vmap/client/javascript/test/e2e/resource/it3/ARDECHE.dbf
rename to src/vitis/client/javascript/test/e2e/resource/it3/ARDECHE.dbf
diff --git a/vmap/client/javascript/test/e2e/resource/it3/ARDECHE.prj b/src/vitis/client/javascript/test/e2e/resource/it3/ARDECHE.prj
similarity index 100%
rename from vmap/client/javascript/test/e2e/resource/it3/ARDECHE.prj
rename to src/vitis/client/javascript/test/e2e/resource/it3/ARDECHE.prj
diff --git a/vmap/client/javascript/test/e2e/resource/it3/ARDECHE.shp b/src/vitis/client/javascript/test/e2e/resource/it3/ARDECHE.shp
similarity index 100%
rename from vmap/client/javascript/test/e2e/resource/it3/ARDECHE.shp
rename to src/vitis/client/javascript/test/e2e/resource/it3/ARDECHE.shp
diff --git a/vmap/client/javascript/test/e2e/resource/it3/ARDECHE.shx b/src/vitis/client/javascript/test/e2e/resource/it3/ARDECHE.shx
similarity index 100%
rename from vmap/client/javascript/test/e2e/resource/it3/ARDECHE.shx
rename to src/vitis/client/javascript/test/e2e/resource/it3/ARDECHE.shx
diff --git a/vmap/client/javascript/test/e2e/resource/metadata.fmw b/src/vitis/client/javascript/test/e2e/resource/metadata.fmw
similarity index 100%
rename from vmap/client/javascript/test/e2e/resource/metadata.fmw
rename to src/vitis/client/javascript/test/e2e/resource/metadata.fmw
diff --git a/vmap/client/javascript/test/e2e/resource/metadata.log b/src/vitis/client/javascript/test/e2e/resource/metadata.log
similarity index 100%
rename from vmap/client/javascript/test/e2e/resource/metadata.log
rename to src/vitis/client/javascript/test/e2e/resource/metadata.log
diff --git a/vmap/client/javascript/test/e2e/resource/metadata2.fmw b/src/vitis/client/javascript/test/e2e/resource/metadata2.fmw
similarity index 100%
rename from vmap/client/javascript/test/e2e/resource/metadata2.fmw
rename to src/vitis/client/javascript/test/e2e/resource/metadata2.fmw
diff --git a/vmap/client/javascript/test/e2e/resource/selection_villes.gex b/src/vitis/client/javascript/test/e2e/resource/selection_villes.gex
similarity index 100%
rename from vmap/client/javascript/test/e2e/resource/selection_villes.gex
rename to src/vitis/client/javascript/test/e2e/resource/selection_villes.gex
diff --git a/vmap/client/javascript/test/e2e/resource/shp2mif.fmw b/src/vitis/client/javascript/test/e2e/resource/shp2mif.fmw
similarity index 100%
rename from vmap/client/javascript/test/e2e/resource/shp2mif.fmw
rename to src/vitis/client/javascript/test/e2e/resource/shp2mif.fmw
diff --git a/vmap/client/javascript/test/e2e/resource/t_abonnement.fmw b/src/vitis/client/javascript/test/e2e/resource/t_abonnement.fmw
similarity index 100%
rename from vmap/client/javascript/test/e2e/resource/t_abonnement.fmw
rename to src/vitis/client/javascript/test/e2e/resource/t_abonnement.fmw
diff --git a/vmap/client/javascript/test/e2e/resource/t_formulaire.fmw b/src/vitis/client/javascript/test/e2e/resource/t_formulaire.fmw
similarity index 100%
rename from vmap/client/javascript/test/e2e/resource/t_formulaire.fmw
rename to src/vitis/client/javascript/test/e2e/resource/t_formulaire.fmw
diff --git a/vmap/client/javascript/test/e2e/resource/t_importparlot1.fmw b/src/vitis/client/javascript/test/e2e/resource/t_importparlot1.fmw
similarity index 100%
rename from vmap/client/javascript/test/e2e/resource/t_importparlot1.fmw
rename to src/vitis/client/javascript/test/e2e/resource/t_importparlot1.fmw
diff --git a/vmap/client/javascript/test/e2e/resource/t_importparlot2.fmw b/src/vitis/client/javascript/test/e2e/resource/t_importparlot2.fmw
similarity index 100%
rename from vmap/client/javascript/test/e2e/resource/t_importparlot2.fmw
rename to src/vitis/client/javascript/test/e2e/resource/t_importparlot2.fmw
diff --git a/vmap/client/javascript/test/e2e/resource/t_unicite.fmw b/src/vitis/client/javascript/test/e2e/resource/t_unicite.fmw
similarity index 100%
rename from vmap/client/javascript/test/e2e/resource/t_unicite.fmw
rename to src/vitis/client/javascript/test/e2e/resource/t_unicite.fmw
diff --git a/vmap/client/javascript/test/e2e/resource/test_gex.gex b/src/vitis/client/javascript/test/e2e/resource/test_gex.gex
similarity index 100%
rename from vmap/client/javascript/test/e2e/resource/test_gex.gex
rename to src/vitis/client/javascript/test/e2e/resource/test_gex.gex
diff --git a/vmap/client/javascript/test/e2e/resource/test_param_choice_villes.fmw b/src/vitis/client/javascript/test/e2e/resource/test_param_choice_villes.fmw
similarity index 100%
rename from vmap/client/javascript/test/e2e/resource/test_param_choice_villes.fmw
rename to src/vitis/client/javascript/test/e2e/resource/test_param_choice_villes.fmw
diff --git a/vmap/client/javascript/test/e2e/resource/test_param_couleur.fmw b/src/vitis/client/javascript/test/e2e/resource/test_param_couleur.fmw
similarity index 100%
rename from vmap/client/javascript/test/e2e/resource/test_param_couleur.fmw
rename to src/vitis/client/javascript/test/e2e/resource/test_param_couleur.fmw
diff --git a/vmap/client/javascript/test/e2e/resource/test_param_date_time.fmw b/src/vitis/client/javascript/test/e2e/resource/test_param_date_time.fmw
similarity index 100%
rename from vmap/client/javascript/test/e2e/resource/test_param_date_time.fmw
rename to src/vitis/client/javascript/test/e2e/resource/test_param_date_time.fmw
diff --git a/vmap/client/javascript/test/e2e/resource/test_param_date_time.log b/src/vitis/client/javascript/test/e2e/resource/test_param_date_time.log
similarity index 100%
rename from vmap/client/javascript/test/e2e/resource/test_param_date_time.log
rename to src/vitis/client/javascript/test/e2e/resource/test_param_date_time.log
diff --git a/vmap/client/javascript/test/e2e/resource/villes.zip b/src/vitis/client/javascript/test/e2e/resource/villes.zip
similarity index 100%
rename from vmap/client/javascript/test/e2e/resource/villes.zip
rename to src/vitis/client/javascript/test/e2e/resource/villes.zip
diff --git a/vmap/client/javascript/test/e2e/resource/vse.jpg b/src/vitis/client/javascript/test/e2e/resource/vse.jpg
similarity index 100%
rename from vmap/client/javascript/test/e2e/resource/vse.jpg
rename to src/vitis/client/javascript/test/e2e/resource/vse.jpg
diff --git "a/vmap/client/javascript/test/e2e/resource/\303\251\303\240.fmw" "b/src/vitis/client/javascript/test/e2e/resource/\303\251\303\240.fmw"
similarity index 100%
rename from "vmap/client/javascript/test/e2e/resource/\303\251\303\240.fmw"
rename to "src/vitis/client/javascript/test/e2e/resource/\303\251\303\240.fmw"
diff --git a/vmap/client/javascript/test/e2e/scenario/sc_vitis_abonnement.js b/src/vitis/client/javascript/test/e2e/scenario/sc_vitis_abonnement.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/scenario/sc_vitis_abonnement.js
rename to src/vitis/client/javascript/test/e2e/scenario/sc_vitis_abonnement.js
diff --git a/vmap/client/javascript/test/e2e/scenario/sc_vitis_ad.js b/src/vitis/client/javascript/test/e2e/scenario/sc_vitis_ad.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/scenario/sc_vitis_ad.js
rename to src/vitis/client/javascript/test/e2e/scenario/sc_vitis_ad.js
diff --git a/vmap/client/javascript/test/e2e/scenario/sc_vitis_categorie.js b/src/vitis/client/javascript/test/e2e/scenario/sc_vitis_categorie.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/scenario/sc_vitis_categorie.js
rename to src/vitis/client/javascript/test/e2e/scenario/sc_vitis_categorie.js
diff --git a/vmap/client/javascript/test/e2e/scenario/sc_vitis_depot.js b/src/vitis/client/javascript/test/e2e/scenario/sc_vitis_depot.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/scenario/sc_vitis_depot.js
rename to src/vitis/client/javascript/test/e2e/scenario/sc_vitis_depot.js
diff --git a/vmap/client/javascript/test/e2e/scenario/sc_vitis_fichiers_interdits.js b/src/vitis/client/javascript/test/e2e/scenario/sc_vitis_fichiers_interdits.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/scenario/sc_vitis_fichiers_interdits.js
rename to src/vitis/client/javascript/test/e2e/scenario/sc_vitis_fichiers_interdits.js
diff --git a/vmap/client/javascript/test/e2e/scenario/sc_vitis_filter.js b/src/vitis/client/javascript/test/e2e/scenario/sc_vitis_filter.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/scenario/sc_vitis_filter.js
rename to src/vitis/client/javascript/test/e2e/scenario/sc_vitis_filter.js
diff --git a/vmap/client/javascript/test/e2e/scenario/sc_vitis_fme_params.js b/src/vitis/client/javascript/test/e2e/scenario/sc_vitis_fme_params.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/scenario/sc_vitis_fme_params.js
rename to src/vitis/client/javascript/test/e2e/scenario/sc_vitis_fme_params.js
diff --git a/vmap/client/javascript/test/e2e/scenario/sc_vitis_formulaire.js b/src/vitis/client/javascript/test/e2e/scenario/sc_vitis_formulaire.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/scenario/sc_vitis_formulaire.js
rename to src/vitis/client/javascript/test/e2e/scenario/sc_vitis_formulaire.js
diff --git a/vmap/client/javascript/test/e2e/scenario/sc_vitis_import_export.js b/src/vitis/client/javascript/test/e2e/scenario/sc_vitis_import_export.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/scenario/sc_vitis_import_export.js
rename to src/vitis/client/javascript/test/e2e/scenario/sc_vitis_import_export.js
diff --git a/vmap/client/javascript/test/e2e/scenario/sc_vitis_ip.js b/src/vitis/client/javascript/test/e2e/scenario/sc_vitis_ip.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/scenario/sc_vitis_ip.js
rename to src/vitis/client/javascript/test/e2e/scenario/sc_vitis_ip.js
diff --git a/vmap/client/javascript/test/e2e/scenario/sc_vitis_lot.js b/src/vitis/client/javascript/test/e2e/scenario/sc_vitis_lot.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/scenario/sc_vitis_lot.js
rename to src/vitis/client/javascript/test/e2e/scenario/sc_vitis_lot.js
diff --git a/vmap/client/javascript/test/e2e/scenario/sc_vitis_metadata.js b/src/vitis/client/javascript/test/e2e/scenario/sc_vitis_metadata.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/scenario/sc_vitis_metadata.js
rename to src/vitis/client/javascript/test/e2e/scenario/sc_vitis_metadata.js
diff --git a/vmap/client/javascript/test/e2e/scenario/sc_vitis_moteurs.js b/src/vitis/client/javascript/test/e2e/scenario/sc_vitis_moteurs.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/scenario/sc_vitis_moteurs.js
rename to src/vitis/client/javascript/test/e2e/scenario/sc_vitis_moteurs.js
diff --git a/vmap/client/javascript/test/e2e/scenario/sc_vitis_order.js b/src/vitis/client/javascript/test/e2e/scenario/sc_vitis_order.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/scenario/sc_vitis_order.js
rename to src/vitis/client/javascript/test/e2e/scenario/sc_vitis_order.js
diff --git a/vmap/client/javascript/test/e2e/scenario/sc_vitis_publication.js b/src/vitis/client/javascript/test/e2e/scenario/sc_vitis_publication.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/scenario/sc_vitis_publication.js
rename to src/vitis/client/javascript/test/e2e/scenario/sc_vitis_publication.js
diff --git a/vmap/client/javascript/test/e2e/scenario/sc_vitis_unicite.js b/src/vitis/client/javascript/test/e2e/scenario/sc_vitis_unicite.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/scenario/sc_vitis_unicite.js
rename to src/vitis/client/javascript/test/e2e/scenario/sc_vitis_unicite.js
diff --git a/vmap/client/javascript/test/e2e/scenario/sc_vitis_upload.js b/src/vitis/client/javascript/test/e2e/scenario/sc_vitis_upload.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/scenario/sc_vitis_upload.js
rename to src/vitis/client/javascript/test/e2e/scenario/sc_vitis_upload.js
diff --git a/vmap/client/javascript/test/e2e/scenario/sc_vitis_upload_fmw.js b/src/vitis/client/javascript/test/e2e/scenario/sc_vitis_upload_fmw.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/scenario/sc_vitis_upload_fmw.js
rename to src/vitis/client/javascript/test/e2e/scenario/sc_vitis_upload_fmw.js
diff --git a/vmap/client/javascript/test/e2e/scenario/sc_vitis_upload_zip.js b/src/vitis/client/javascript/test/e2e/scenario/sc_vitis_upload_zip.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/scenario/sc_vitis_upload_zip.js
rename to src/vitis/client/javascript/test/e2e/scenario/sc_vitis_upload_zip.js
diff --git a/vmap/client/javascript/test/e2e/scenario/sc_vitis_user_existant.js b/src/vitis/client/javascript/test/e2e/scenario/sc_vitis_user_existant.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/scenario/sc_vitis_user_existant.js
rename to src/vitis/client/javascript/test/e2e/scenario/sc_vitis_user_existant.js
diff --git a/vmap/client/javascript/test/e2e/scenario/sc_vitis_users.js b/src/vitis/client/javascript/test/e2e/scenario/sc_vitis_users.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/scenario/sc_vitis_users.js
rename to src/vitis/client/javascript/test/e2e/scenario/sc_vitis_users.js
diff --git a/vmap/client/javascript/test/e2e/scenario/sc_vitis_users_linux.js b/src/vitis/client/javascript/test/e2e/scenario/sc_vitis_users_linux.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/scenario/sc_vitis_users_linux.js
rename to src/vitis/client/javascript/test/e2e/scenario/sc_vitis_users_linux.js
diff --git a/vmap/client/javascript/test/e2e/scenario/sc_vitis_users_speciaux.js b/src/vitis/client/javascript/test/e2e/scenario/sc_vitis_users_speciaux.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/scenario/sc_vitis_users_speciaux.js
rename to src/vitis/client/javascript/test/e2e/scenario/sc_vitis_users_speciaux.js
diff --git a/vmap/client/javascript/test/e2e/scenario/sc_vitis_users_speciaux_linux.js b/src/vitis/client/javascript/test/e2e/scenario/sc_vitis_users_speciaux_linux.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/scenario/sc_vitis_users_speciaux_linux.js
rename to src/vitis/client/javascript/test/e2e/scenario/sc_vitis_users_speciaux_linux.js
diff --git a/vmap/client/javascript/test/e2e/scenario/sc_vitis_verrouillage_projet.js b/src/vitis/client/javascript/test/e2e/scenario/sc_vitis_verrouillage_projet.js
similarity index 100%
rename from vmap/client/javascript/test/e2e/scenario/sc_vitis_verrouillage_projet.js
rename to src/vitis/client/javascript/test/e2e/scenario/sc_vitis_verrouillage_projet.js
diff --git a/vmap/client/lang/lang-en.json b/src/vitis/client/lang/lang-en.json
old mode 100755
new mode 100644
similarity index 95%
rename from vmap/client/lang/lang-en.json
rename to src/vitis/client/lang/lang-en.json
index 3bd5249589d06532c4e608e63f9c1e0789826cc3..349fcf07df20a59f918709e36e4db469d4cfcffb
--- a/vmap/client/lang/lang-en.json
+++ b/src/vitis/client/lang/lang-en.json
@@ -6,6 +6,7 @@
     "FORM_LOGIN_CONNECT": "Connect",
     "FORM_LOGIN_CONNECTION_ERROR": "Connection failed. Incorrect user / password / domain or database not available",
     "FORM_LOGIN_CONNECTION_ERROR_FORBIDDEN_IP": "Connection failed. IP [IPAddress] forbiden",
+    "FORM_LOGIN_CONNECTION_ERROR_MISSING_PRIVILEGES": "Connection failed. The user does not have the required privileges. Please contact your administrator.",
     "FORM_LOGIN_REMEMBER_ME": "Remember connection?",
     "FORM_APP_STATUS_ERROR": "Unstable application",
     "FORM_VAS_STATUS_ERROR": "Unstable VAS",
diff --git a/vmap/client/lang/lang-fr.json b/src/vitis/client/lang/lang-fr.json
old mode 100755
new mode 100644
similarity index 95%
rename from vmap/client/lang/lang-fr.json
rename to src/vitis/client/lang/lang-fr.json
index 3972c0f0c6f756803a0bd0c52a14b8fd267961a4..5c5eb178de24b151ef22b6b2e7c0701363bc0297
--- a/vmap/client/lang/lang-fr.json
+++ b/src/vitis/client/lang/lang-fr.json
@@ -6,6 +6,7 @@
     "FORM_LOGIN_CONNECT": "Connexion",
     "FORM_LOGIN_CONNECTION_ERROR": "Connexion refusée. Utilisateur / Mot de passe / domaine incorrect ou base de données non disponible.",
     "FORM_LOGIN_CONNECTION_ERROR_FORBIDDEN_IP": "Connexion refusée. Adresse IP [IPAddress] non autorisée",
+    "FORM_LOGIN_CONNECTION_ERROR_MISSING_PRIVILEGES": "Connexion refusée. L'utilisateur ne dispose pas des privilèges requis. Merci de contacter votre administrateur.",
     "FORM_LOGIN_REMEMBER_ME": "Se souvenir de moi ?",
     "FORM_APP_STATUS_ERROR": "Application instable",
     "FORM_VAS_STATUS_ERROR": "VAS instable",
diff --git a/vmap/client/less/doubleForm.less b/src/vitis/client/less/doubleForm.less
similarity index 100%
rename from vmap/client/less/doubleForm.less
rename to src/vitis/client/less/doubleForm.less
diff --git a/vmap/client/less/htmlForm.less b/src/vitis/client/less/htmlForm.less
similarity index 100%
rename from vmap/client/less/htmlForm.less
rename to src/vitis/client/less/htmlForm.less
diff --git a/vmap/client/less/login.less b/src/vitis/client/less/login.less
similarity index 100%
rename from vmap/client/less/login.less
rename to src/vitis/client/less/login.less
diff --git a/vmap/client/less/main.less b/src/vitis/client/less/main.less
old mode 100644
new mode 100755
similarity index 100%
rename from vmap/client/less/main.less
rename to src/vitis/client/less/main.less
diff --git a/vmap/client/less/mobile.less b/src/vitis/client/less/mobile.less
similarity index 100%
rename from vmap/client/less/mobile.less
rename to src/vitis/client/less/mobile.less
diff --git a/vmap/client/less/sectionForm.less b/src/vitis/client/less/sectionForm.less
similarity index 100%
rename from vmap/client/less/sectionForm.less
rename to src/vitis/client/less/sectionForm.less
diff --git a/vmap/client/less/simpleForm.less b/src/vitis/client/less/simpleForm.less
similarity index 100%
rename from vmap/client/less/simpleForm.less
rename to src/vitis/client/less/simpleForm.less
diff --git a/vmap/client/less/workspaceList.less b/src/vitis/client/less/workspaceList.less
similarity index 100%
rename from vmap/client/less/workspaceList.less
rename to src/vitis/client/less/workspaceList.less
diff --git a/vmap/client/modules/vitis/data/proj.json b/src/vitis/client/modules/vitis/data/proj.json
similarity index 100%
rename from vmap/client/modules/vitis/data/proj.json
rename to src/vitis/client/modules/vitis/data/proj.json
diff --git a/vmap/client/modules/vitis/forms/configuration/configuration_vitis_configuration.json b/src/vitis/client/modules/vitis/forms/configuration/configuration_vitis_configuration.json
old mode 100644
new mode 100755
similarity index 100%
rename from vmap/client/modules/vitis/forms/configuration/configuration_vitis_configuration.json
rename to src/vitis/client/modules/vitis/forms/configuration/configuration_vitis_configuration.json
diff --git a/vmap/client/modules/vitis/forms/logs/logs_vitis_log.json b/src/vitis/client/modules/vitis/forms/logs/logs_vitis_log.json
similarity index 100%
rename from vmap/client/modules/vitis/forms/logs/logs_vitis_log.json
rename to src/vitis/client/modules/vitis/forms/logs/logs_vitis_log.json
diff --git a/vmap/client/modules/vitis/forms/user/user_vitis_user.js b/src/vitis/client/modules/vitis/forms/user/user_vitis_user.js
similarity index 100%
rename from vmap/client/modules/vitis/forms/user/user_vitis_user.js
rename to src/vitis/client/modules/vitis/forms/user/user_vitis_user.js
diff --git a/vmap/client/modules/vitis/forms/user/user_vitis_user.json b/src/vitis/client/modules/vitis/forms/user/user_vitis_user.json
old mode 100644
new mode 100755
similarity index 100%
rename from vmap/client/modules/vitis/forms/user/user_vitis_user.json
rename to src/vitis/client/modules/vitis/forms/user/user_vitis_user.json
diff --git a/vmap/client/modules/vitis/forms/users/active_directory_connection.json b/src/vitis/client/modules/vitis/forms/users/active_directory_connection.json
similarity index 100%
rename from vmap/client/modules/vitis/forms/users/active_directory_connection.json
rename to src/vitis/client/modules/vitis/forms/users/active_directory_connection.json
diff --git a/vmap/client/modules/vitis/forms/users/search_active_directory_group.json b/src/vitis/client/modules/vitis/forms/users/search_active_directory_group.json
similarity index 100%
rename from vmap/client/modules/vitis/forms/users/search_active_directory_group.json
rename to src/vitis/client/modules/vitis/forms/users/search_active_directory_group.json
diff --git a/vmap/client/modules/vitis/forms/users/search_active_directory_person.json b/src/vitis/client/modules/vitis/forms/users/search_active_directory_person.json
similarity index 100%
rename from vmap/client/modules/vitis/forms/users/search_active_directory_person.json
rename to src/vitis/client/modules/vitis/forms/users/search_active_directory_person.json
diff --git a/vmap/client/modules/vitis/forms/users/users_vitis_billinggroup.json b/src/vitis/client/modules/vitis/forms/users/users_vitis_billinggroup.json
similarity index 100%
rename from vmap/client/modules/vitis/forms/users/users_vitis_billinggroup.json
rename to src/vitis/client/modules/vitis/forms/users/users_vitis_billinggroup.json
diff --git a/vmap/client/modules/vitis/forms/users/users_vitis_domain.json b/src/vitis/client/modules/vitis/forms/users/users_vitis_domain.json
similarity index 100%
rename from vmap/client/modules/vitis/forms/users/users_vitis_domain.json
rename to src/vitis/client/modules/vitis/forms/users/users_vitis_domain.json
diff --git a/vmap/client/modules/vitis/forms/users/users_vitis_group.json b/src/vitis/client/modules/vitis/forms/users/users_vitis_group.json
similarity index 100%
rename from vmap/client/modules/vitis/forms/users/users_vitis_group.json
rename to src/vitis/client/modules/vitis/forms/users/users_vitis_group.json
diff --git a/vmap/client/modules/vitis/forms/users/users_vitis_privilege.json b/src/vitis/client/modules/vitis/forms/users/users_vitis_privilege.json
similarity index 100%
rename from vmap/client/modules/vitis/forms/users/users_vitis_privilege.json
rename to src/vitis/client/modules/vitis/forms/users/users_vitis_privilege.json
diff --git a/vmap/client/modules/vitis/forms/users/users_vitis_users.json b/src/vitis/client/modules/vitis/forms/users/users_vitis_users.json
old mode 100644
new mode 100755
similarity index 100%
rename from vmap/client/modules/vitis/forms/users/users_vitis_users.json
rename to src/vitis/client/modules/vitis/forms/users/users_vitis_users.json
diff --git a/vmap/client/modules/vitis/images/administrator.png b/src/vitis/client/modules/vitis/images/administrator.png
similarity index 100%
rename from vmap/client/modules/vitis/images/administrator.png
rename to src/vitis/client/modules/vitis/images/administrator.png
diff --git a/vmap/client/modules/vitis/images/button_green.gif b/src/vitis/client/modules/vitis/images/button_green.gif
similarity index 100%
rename from vmap/client/modules/vitis/images/button_green.gif
rename to src/vitis/client/modules/vitis/images/button_green.gif
diff --git a/vmap/client/modules/vitis/images/button_red.gif b/src/vitis/client/modules/vitis/images/button_red.gif
similarity index 100%
rename from vmap/client/modules/vitis/images/button_red.gif
rename to src/vitis/client/modules/vitis/images/button_red.gif
diff --git a/vmap/client/modules/vitis/images/user.png b/src/vitis/client/modules/vitis/images/user.png
similarity index 100%
rename from vmap/client/modules/vitis/images/user.png
rename to src/vitis/client/modules/vitis/images/user.png
diff --git a/vmap/client/modules/vitis/javascript/controllers/activeDirectoryTreeCtrl.js b/src/vitis/client/modules/vitis/javascript/controllers/activeDirectoryTreeCtrl.js
similarity index 100%
rename from vmap/client/modules/vitis/javascript/controllers/activeDirectoryTreeCtrl.js
rename to src/vitis/client/modules/vitis/javascript/controllers/activeDirectoryTreeCtrl.js
diff --git a/vmap/client/modules/vitis/javascript/controllers/logsCtrl.js b/src/vitis/client/modules/vitis/javascript/controllers/logsCtrl.js
similarity index 100%
rename from vmap/client/modules/vitis/javascript/controllers/logsCtrl.js
rename to src/vitis/client/modules/vitis/javascript/controllers/logsCtrl.js
diff --git a/vmap/client/modules/vitis/javascript/controllers/versionConfigurationCtrl.js b/src/vitis/client/modules/vitis/javascript/controllers/versionConfigurationCtrl.js
similarity index 100%
rename from vmap/client/modules/vitis/javascript/controllers/versionConfigurationCtrl.js
rename to src/vitis/client/modules/vitis/javascript/controllers/versionConfigurationCtrl.js
diff --git a/vmap/client/modules/vitis/javascript/controllers/webServiceHelpCtrl.js b/src/vitis/client/modules/vitis/javascript/controllers/webServiceHelpCtrl.js
similarity index 100%
rename from vmap/client/modules/vitis/javascript/controllers/webServiceHelpCtrl.js
rename to src/vitis/client/modules/vitis/javascript/controllers/webServiceHelpCtrl.js
diff --git a/vmap/client/modules/vitis/javascript/controllers/websocketConfigurationCtrl.js b/src/vitis/client/modules/vitis/javascript/controllers/websocketConfigurationCtrl.js
similarity index 100%
rename from vmap/client/modules/vitis/javascript/controllers/websocketConfigurationCtrl.js
rename to src/vitis/client/modules/vitis/javascript/controllers/websocketConfigurationCtrl.js
diff --git a/vmap/client/modules/vitis/javascript/deps.js b/src/vitis/client/modules/vitis/javascript/deps.js
similarity index 100%
rename from vmap/client/modules/vitis/javascript/deps.js
rename to src/vitis/client/modules/vitis/javascript/deps.js
diff --git a/vmap/client/modules/vitis/javascript/directives/activeDirectoryTreeDrtv.js b/src/vitis/client/modules/vitis/javascript/directives/activeDirectoryTreeDrtv.js
similarity index 100%
rename from vmap/client/modules/vitis/javascript/directives/activeDirectoryTreeDrtv.js
rename to src/vitis/client/modules/vitis/javascript/directives/activeDirectoryTreeDrtv.js
diff --git a/vmap/client/modules/vitis/javascript/directives/logsDrtv.js b/src/vitis/client/modules/vitis/javascript/directives/logsDrtv.js
similarity index 100%
rename from vmap/client/modules/vitis/javascript/directives/logsDrtv.js
rename to src/vitis/client/modules/vitis/javascript/directives/logsDrtv.js
diff --git a/vmap/client/modules/vitis/javascript/directives/phpInfoConfigurationDrtv.js b/src/vitis/client/modules/vitis/javascript/directives/phpInfoConfigurationDrtv.js
similarity index 100%
rename from vmap/client/modules/vitis/javascript/directives/phpInfoConfigurationDrtv.js
rename to src/vitis/client/modules/vitis/javascript/directives/phpInfoConfigurationDrtv.js
diff --git a/vmap/client/modules/vitis/javascript/directives/versionConfigurationDrtv.js b/src/vitis/client/modules/vitis/javascript/directives/versionConfigurationDrtv.js
similarity index 100%
rename from vmap/client/modules/vitis/javascript/directives/versionConfigurationDrtv.js
rename to src/vitis/client/modules/vitis/javascript/directives/versionConfigurationDrtv.js
diff --git a/vmap/client/modules/vitis/javascript/directives/webServiceHelpDrtv.js b/src/vitis/client/modules/vitis/javascript/directives/webServiceHelpDrtv.js
similarity index 100%
rename from vmap/client/modules/vitis/javascript/directives/webServiceHelpDrtv.js
rename to src/vitis/client/modules/vitis/javascript/directives/webServiceHelpDrtv.js
diff --git a/vmap/client/modules/vitis/javascript/directives/websocketConfigurationDrtv.js b/src/vitis/client/modules/vitis/javascript/directives/websocketConfigurationDrtv.js
similarity index 100%
rename from vmap/client/modules/vitis/javascript/directives/websocketConfigurationDrtv.js
rename to src/vitis/client/modules/vitis/javascript/directives/websocketConfigurationDrtv.js
diff --git a/vmap/client/modules/vitis/javascript/script_module.js b/src/vitis/client/modules/vitis/javascript/script_module.js
similarity index 100%
rename from vmap/client/modules/vitis/javascript/script_module.js
rename to src/vitis/client/modules/vitis/javascript/script_module.js
diff --git a/vmap/client/modules/vitis/lang/lang-en.json b/src/vitis/client/modules/vitis/lang/lang-en.json
old mode 100644
new mode 100755
similarity index 100%
rename from vmap/client/modules/vitis/lang/lang-en.json
rename to src/vitis/client/modules/vitis/lang/lang-en.json
diff --git a/vmap/client/modules/vitis/lang/lang-fr.json b/src/vitis/client/modules/vitis/lang/lang-fr.json
old mode 100644
new mode 100755
similarity index 100%
rename from vmap/client/modules/vitis/lang/lang-fr.json
rename to src/vitis/client/modules/vitis/lang/lang-fr.json
diff --git a/vmap/client/modules/vitis/less/activeDirectoryTree.less b/src/vitis/client/modules/vitis/less/activeDirectoryTree.less
similarity index 100%
rename from vmap/client/modules/vitis/less/activeDirectoryTree.less
rename to src/vitis/client/modules/vitis/less/activeDirectoryTree.less
diff --git a/vmap/client/modules/vitis/less/logs.less b/src/vitis/client/modules/vitis/less/logs.less
similarity index 100%
rename from vmap/client/modules/vitis/less/logs.less
rename to src/vitis/client/modules/vitis/less/logs.less
diff --git a/vmap/client/modules/vitis/less/main.less b/src/vitis/client/modules/vitis/less/main.less
similarity index 100%
rename from vmap/client/modules/vitis/less/main.less
rename to src/vitis/client/modules/vitis/less/main.less
diff --git a/vmap/client/modules/vitis/less/phpInfoConfiguration.less b/src/vitis/client/modules/vitis/less/phpInfoConfiguration.less
similarity index 100%
rename from vmap/client/modules/vitis/less/phpInfoConfiguration.less
rename to src/vitis/client/modules/vitis/less/phpInfoConfiguration.less
diff --git a/vmap/client/modules/vitis/less/updateConfiguration.less b/src/vitis/client/modules/vitis/less/updateConfiguration.less
similarity index 100%
rename from vmap/client/modules/vitis/less/updateConfiguration.less
rename to src/vitis/client/modules/vitis/less/updateConfiguration.less
diff --git a/vmap/client/modules/vitis/less/users.less b/src/vitis/client/modules/vitis/less/users.less
similarity index 100%
rename from vmap/client/modules/vitis/less/users.less
rename to src/vitis/client/modules/vitis/less/users.less
diff --git a/vmap/client/modules/vitis/less/versionConfiguration.less b/src/vitis/client/modules/vitis/less/versionConfiguration.less
similarity index 100%
rename from vmap/client/modules/vitis/less/versionConfiguration.less
rename to src/vitis/client/modules/vitis/less/versionConfiguration.less
diff --git a/vmap/client/modules/vitis/less/webServiceHelp.less b/src/vitis/client/modules/vitis/less/webServiceHelp.less
similarity index 100%
rename from vmap/client/modules/vitis/less/webServiceHelp.less
rename to src/vitis/client/modules/vitis/less/webServiceHelp.less
diff --git a/vmap/client/modules/vitis/templates/activeDirectoryTreeLeftTpl.html b/src/vitis/client/modules/vitis/templates/activeDirectoryTreeLeftTpl.html
similarity index 100%
rename from vmap/client/modules/vitis/templates/activeDirectoryTreeLeftTpl.html
rename to src/vitis/client/modules/vitis/templates/activeDirectoryTreeLeftTpl.html
diff --git a/vmap/client/modules/vitis/templates/activeDirectoryTreeRightTpl.html b/src/vitis/client/modules/vitis/templates/activeDirectoryTreeRightTpl.html
similarity index 100%
rename from vmap/client/modules/vitis/templates/activeDirectoryTreeRightTpl.html
rename to src/vitis/client/modules/vitis/templates/activeDirectoryTreeRightTpl.html
diff --git a/vmap/client/modules/vitis/templates/logsLeftTpl.html b/src/vitis/client/modules/vitis/templates/logsLeftTpl.html
similarity index 100%
rename from vmap/client/modules/vitis/templates/logsLeftTpl.html
rename to src/vitis/client/modules/vitis/templates/logsLeftTpl.html
diff --git a/vmap/client/modules/vitis/templates/logsRightTpl.html b/src/vitis/client/modules/vitis/templates/logsRightTpl.html
similarity index 100%
rename from vmap/client/modules/vitis/templates/logsRightTpl.html
rename to src/vitis/client/modules/vitis/templates/logsRightTpl.html
diff --git a/vmap/client/modules/vitis/templates/phpInfoConfigurationTpl.html b/src/vitis/client/modules/vitis/templates/phpInfoConfigurationTpl.html
similarity index 100%
rename from vmap/client/modules/vitis/templates/phpInfoConfigurationTpl.html
rename to src/vitis/client/modules/vitis/templates/phpInfoConfigurationTpl.html
diff --git a/vmap/client/modules/vitis/templates/updateConfigurationTpl.html b/src/vitis/client/modules/vitis/templates/updateConfigurationTpl.html
similarity index 100%
rename from vmap/client/modules/vitis/templates/updateConfigurationTpl.html
rename to src/vitis/client/modules/vitis/templates/updateConfigurationTpl.html
diff --git a/vmap/client/modules/vitis/templates/versionConfigurationTpl.html b/src/vitis/client/modules/vitis/templates/versionConfigurationTpl.html
similarity index 100%
rename from vmap/client/modules/vitis/templates/versionConfigurationTpl.html
rename to src/vitis/client/modules/vitis/templates/versionConfigurationTpl.html
diff --git a/vmap/client/modules/vitis/templates/webServiceHelpTpl.html b/src/vitis/client/modules/vitis/templates/webServiceHelpTpl.html
similarity index 100%
rename from vmap/client/modules/vitis/templates/webServiceHelpTpl.html
rename to src/vitis/client/modules/vitis/templates/webServiceHelpTpl.html
diff --git a/vmap/client/modules/vitis/templates/websocketConfigurationTpl.html b/src/vitis/client/modules/vitis/templates/websocketConfigurationTpl.html
similarity index 100%
rename from vmap/client/modules/vitis/templates/websocketConfigurationTpl.html
rename to src/vitis/client/modules/vitis/templates/websocketConfigurationTpl.html
diff --git a/vmap/client/templates/clientDocumentationTpl.html b/src/vitis/client/templates/clientDocumentationTpl.html
similarity index 100%
rename from vmap/client/templates/clientDocumentationTpl.html
rename to src/vitis/client/templates/clientDocumentationTpl.html
diff --git a/vmap/client/templates/creditsTpl.html b/src/vitis/client/templates/creditsTpl.html
similarity index 100%
rename from vmap/client/templates/creditsTpl.html
rename to src/vitis/client/templates/creditsTpl.html
diff --git a/vmap/client/templates/doubleFormTpl.html b/src/vitis/client/templates/doubleFormTpl.html
similarity index 100%
rename from vmap/client/templates/doubleFormTpl.html
rename to src/vitis/client/templates/doubleFormTpl.html
diff --git a/vmap/client/templates/formTpl.html b/src/vitis/client/templates/formTpl.html
similarity index 100%
rename from vmap/client/templates/formTpl.html
rename to src/vitis/client/templates/formTpl.html
diff --git a/vmap/client/templates/loginTpl.html b/src/vitis/client/templates/loginTpl.html
similarity index 100%
rename from vmap/client/templates/loginTpl.html
rename to src/vitis/client/templates/loginTpl.html
diff --git a/vmap/client/templates/mainTpl.html b/src/vitis/client/templates/mainTpl.html
similarity index 100%
rename from vmap/client/templates/mainTpl.html
rename to src/vitis/client/templates/mainTpl.html
diff --git a/vmap/client/templates/sectionFormTpl.html b/src/vitis/client/templates/sectionFormTpl.html
similarity index 100%
rename from vmap/client/templates/sectionFormTpl.html
rename to src/vitis/client/templates/sectionFormTpl.html
diff --git a/vmap/client/templates/simpleFormTpl.html b/src/vitis/client/templates/simpleFormTpl.html
similarity index 100%
rename from vmap/client/templates/simpleFormTpl.html
rename to src/vitis/client/templates/simpleFormTpl.html
diff --git a/vmap/client/templates/uiGridActionTpl.html b/src/vitis/client/templates/uiGridActionTpl.html
similarity index 100%
rename from vmap/client/templates/uiGridActionTpl.html
rename to src/vitis/client/templates/uiGridActionTpl.html
diff --git a/vmap/client/templates/uiGridPaginationTpl.html b/src/vitis/client/templates/uiGridPaginationTpl.html
similarity index 100%
rename from vmap/client/templates/uiGridPaginationTpl.html
rename to src/vitis/client/templates/uiGridPaginationTpl.html
diff --git a/vmap/client/templates/workspaceListTpl.html b/src/vitis/client/templates/workspaceListTpl.html
similarity index 100%
rename from vmap/client/templates/workspaceListTpl.html
rename to src/vitis/client/templates/workspaceListTpl.html
diff --git a/vmap/vas/CHANGE_LOG.txt b/src/vitis/vas/CHANGE_LOG.txt
similarity index 100%
rename from vmap/vas/CHANGE_LOG.txt
rename to src/vitis/vas/CHANGE_LOG.txt
diff --git a/vmap/vas/_install/apache.conf b/src/vitis/vas/_install/apache.conf
similarity index 100%
rename from vmap/vas/_install/apache.conf
rename to src/vitis/vas/_install/apache.conf
diff --git a/vmap/vas/_install/dependencies/mapserver/.htaccess b/src/vitis/vas/_install/dependencies/mapserver/.htaccess
similarity index 100%
rename from vmap/vas/_install/dependencies/mapserver/.htaccess
rename to src/vitis/vas/_install/dependencies/mapserver/.htaccess
diff --git a/vmap/vas/_install/dependencies/mapserver/linux/apache.conf b/src/vitis/vas/_install/dependencies/mapserver/linux/apache.conf
similarity index 100%
rename from vmap/vas/_install/dependencies/mapserver/linux/apache.conf
rename to src/vitis/vas/_install/dependencies/mapserver/linux/apache.conf
diff --git a/vmap/vas/_install/dependencies/mapserver/windows/apache.conf b/src/vitis/vas/_install/dependencies/mapserver/windows/apache.conf
similarity index 100%
rename from vmap/vas/_install/dependencies/mapserver/windows/apache.conf
rename to src/vitis/vas/_install/dependencies/mapserver/windows/apache.conf
diff --git a/vmap/vas/_install/dependencies/php/linux/apache.conf b/src/vitis/vas/_install/dependencies/php/linux/apache.conf
similarity index 100%
rename from vmap/vas/_install/dependencies/php/linux/apache.conf
rename to src/vitis/vas/_install/dependencies/php/linux/apache.conf
diff --git a/vmap/vas/_install/dependencies/php/php.ini b/src/vitis/vas/_install/dependencies/php/php.ini
similarity index 100%
rename from vmap/vas/_install/dependencies/php/php.ini
rename to src/vitis/vas/_install/dependencies/php/php.ini
diff --git a/vmap/vas/_install/dependencies/php/windows/apache.conf b/src/vitis/vas/_install/dependencies/php/windows/apache.conf
similarity index 100%
rename from vmap/vas/_install/dependencies/php/windows/apache.conf
rename to src/vitis/vas/_install/dependencies/php/windows/apache.conf
diff --git a/vmap/vas/_install/dependencies/pycron/crontab.txt b/src/vitis/vas/_install/dependencies/pycron/crontab.txt
old mode 100644
new mode 100755
similarity index 100%
rename from vmap/vas/_install/dependencies/pycron/crontab.txt
rename to src/vitis/vas/_install/dependencies/pycron/crontab.txt
diff --git a/vmap/vas/_install/dependencies/websocket/apache.conf b/src/vitis/vas/_install/dependencies/websocket/apache.conf
similarity index 100%
rename from vmap/vas/_install/dependencies/websocket/apache.conf
rename to src/vitis/vas/_install/dependencies/websocket/apache.conf
diff --git a/vmap/vas/_install/dependencies/websocket/linux/websocket_vitis b/src/vitis/vas/_install/dependencies/websocket/linux/websocket_vitis
similarity index 100%
rename from vmap/vas/_install/dependencies/websocket/linux/websocket_vitis
rename to src/vitis/vas/_install/dependencies/websocket/linux/websocket_vitis
diff --git a/vmap/vas/_install/dependencies/websocket/websocket.cfg b/src/vitis/vas/_install/dependencies/websocket/websocket.cfg
similarity index 100%
rename from vmap/vas/_install/dependencies/websocket/websocket.cfg
rename to src/vitis/vas/_install/dependencies/websocket/websocket.cfg
diff --git a/vmap/vas/_install/dependency.xml b/src/vitis/vas/_install/dependency.xml
old mode 100644
new mode 100755
similarity index 93%
rename from vmap/vas/_install/dependency.xml
rename to src/vitis/vas/_install/dependency.xml
index 447c0e2dfbb751840afa008c0d01cacdc00b96d1..7efd25915a6502da7eaad660780877ded794c91f
--- a/vmap/vas/_install/dependency.xml
+++ b/src/vitis/vas/_install/dependency.xml
@@ -3,7 +3,7 @@
 <installer>
 	<schema>
 		<name>s_vitis</name>
-		<version>2018.04.01</version>
+		<version>2018.05.00</version>
 		<dependenciesCollection>
 			<dependency>
 				<name>postgres</name>
diff --git a/vmap/vas/_install/listModuleApache.txt b/src/vitis/vas/_install/listModuleApache.txt
similarity index 100%
rename from vmap/vas/_install/listModuleApache.txt
rename to src/vitis/vas/_install/listModuleApache.txt
diff --git a/vmap/vas/doc/composer.json b/src/vitis/vas/doc/composer.json
similarity index 100%
rename from vmap/vas/doc/composer.json
rename to src/vitis/vas/doc/composer.json
diff --git a/vmap/vas/doc/composer.lock b/src/vitis/vas/doc/composer.lock
similarity index 100%
rename from vmap/vas/doc/composer.lock
rename to src/vitis/vas/doc/composer.lock
diff --git a/vmap/vas/doc/css/reset.css b/src/vitis/vas/doc/css/reset.css
similarity index 100%
rename from vmap/vas/doc/css/reset.css
rename to src/vitis/vas/doc/css/reset.css
diff --git a/vmap/vas/doc/css/screen.css b/src/vitis/vas/doc/css/screen.css
similarity index 100%
rename from vmap/vas/doc/css/screen.css
rename to src/vitis/vas/doc/css/screen.css
diff --git a/vmap/vas/doc/css/style.css b/src/vitis/vas/doc/css/style.css
similarity index 100%
rename from vmap/vas/doc/css/style.css
rename to src/vitis/vas/doc/css/style.css
diff --git a/vmap/vas/doc/images/gtf_ws.png b/src/vitis/vas/doc/images/gtf_ws.png
similarity index 100%
rename from vmap/vas/doc/images/gtf_ws.png
rename to src/vitis/vas/doc/images/gtf_ws.png
diff --git a/vmap/vas/doc/images/order.png b/src/vitis/vas/doc/images/order.png
similarity index 100%
rename from vmap/vas/doc/images/order.png
rename to src/vitis/vas/doc/images/order.png
diff --git a/vmap/vas/doc/images/overview.png b/src/vitis/vas/doc/images/overview.png
similarity index 100%
rename from vmap/vas/doc/images/overview.png
rename to src/vitis/vas/doc/images/overview.png
diff --git a/vmap/vas/doc/images/rest.png b/src/vitis/vas/doc/images/rest.png
similarity index 100%
rename from vmap/vas/doc/images/rest.png
rename to src/vitis/vas/doc/images/rest.png
diff --git a/vmap/vas/doc/images/throbber.gif b/src/vitis/vas/doc/images/throbber.gif
similarity index 100%
rename from vmap/vas/doc/images/throbber.gif
rename to src/vitis/vas/doc/images/throbber.gif
diff --git a/vmap/vas/doc/images/token.png b/src/vitis/vas/doc/images/token.png
similarity index 100%
rename from vmap/vas/doc/images/token.png
rename to src/vitis/vas/doc/images/token.png
diff --git a/vmap/vas/doc/images/workspace.png b/src/vitis/vas/doc/images/workspace.png
similarity index 100%
rename from vmap/vas/doc/images/workspace.png
rename to src/vitis/vas/doc/images/workspace.png
diff --git a/vmap/vas/doc/index.phtml b/src/vitis/vas/doc/index.phtml
similarity index 100%
rename from vmap/vas/doc/index.phtml
rename to src/vitis/vas/doc/index.phtml
diff --git a/vmap/vas/doc/javascript/backbone-min.js b/src/vitis/vas/doc/javascript/backbone-min.js
similarity index 100%
rename from vmap/vas/doc/javascript/backbone-min.js
rename to src/vitis/vas/doc/javascript/backbone-min.js
diff --git a/vmap/vas/doc/javascript/handlebars-1.0.0.js b/src/vitis/vas/doc/javascript/handlebars-1.0.0.js
similarity index 100%
rename from vmap/vas/doc/javascript/handlebars-1.0.0.js
rename to src/vitis/vas/doc/javascript/handlebars-1.0.0.js
diff --git a/vmap/vas/doc/javascript/handlebars-2.0.0.js b/src/vitis/vas/doc/javascript/handlebars-2.0.0.js
similarity index 100%
rename from vmap/vas/doc/javascript/handlebars-2.0.0.js
rename to src/vitis/vas/doc/javascript/handlebars-2.0.0.js
diff --git a/vmap/vas/doc/javascript/highlight.7.3.pack.js b/src/vitis/vas/doc/javascript/highlight.7.3.pack.js
similarity index 100%
rename from vmap/vas/doc/javascript/highlight.7.3.pack.js
rename to src/vitis/vas/doc/javascript/highlight.7.3.pack.js
diff --git a/vmap/vas/doc/javascript/jquery-1.8.0.min.js b/src/vitis/vas/doc/javascript/jquery-1.8.0.min.js
similarity index 100%
rename from vmap/vas/doc/javascript/jquery-1.8.0.min.js
rename to src/vitis/vas/doc/javascript/jquery-1.8.0.min.js
diff --git a/vmap/vas/doc/javascript/jquery.ba-bbq.min.js b/src/vitis/vas/doc/javascript/jquery.ba-bbq.min.js
similarity index 100%
rename from vmap/vas/doc/javascript/jquery.ba-bbq.min.js
rename to src/vitis/vas/doc/javascript/jquery.ba-bbq.min.js
diff --git a/vmap/vas/doc/javascript/jquery.slideto.min.js b/src/vitis/vas/doc/javascript/jquery.slideto.min.js
similarity index 100%
rename from vmap/vas/doc/javascript/jquery.slideto.min.js
rename to src/vitis/vas/doc/javascript/jquery.slideto.min.js
diff --git a/vmap/vas/doc/javascript/jquery.wiggle.min.js b/src/vitis/vas/doc/javascript/jquery.wiggle.min.js
similarity index 100%
rename from vmap/vas/doc/javascript/jquery.wiggle.min.js
rename to src/vitis/vas/doc/javascript/jquery.wiggle.min.js
diff --git a/vmap/vas/doc/javascript/marked.js b/src/vitis/vas/doc/javascript/marked.js
similarity index 100%
rename from vmap/vas/doc/javascript/marked.js
rename to src/vitis/vas/doc/javascript/marked.js
diff --git a/vmap/vas/doc/javascript/shred.bundle.js b/src/vitis/vas/doc/javascript/shred.bundle.js
similarity index 100%
rename from vmap/vas/doc/javascript/shred.bundle.js
rename to src/vitis/vas/doc/javascript/shred.bundle.js
diff --git a/vmap/vas/doc/javascript/shred/content.js b/src/vitis/vas/doc/javascript/shred/content.js
similarity index 100%
rename from vmap/vas/doc/javascript/shred/content.js
rename to src/vitis/vas/doc/javascript/shred/content.js
diff --git a/vmap/vas/doc/javascript/swagger-oauth.js b/src/vitis/vas/doc/javascript/swagger-oauth.js
similarity index 100%
rename from vmap/vas/doc/javascript/swagger-oauth.js
rename to src/vitis/vas/doc/javascript/swagger-oauth.js
diff --git a/vmap/vas/doc/javascript/swagger-ui.js b/src/vitis/vas/doc/javascript/swagger-ui.js
similarity index 100%
rename from vmap/vas/doc/javascript/swagger-ui.js
rename to src/vitis/vas/doc/javascript/swagger-ui.js
diff --git a/vmap/vas/doc/javascript/swagger-ui.min.js b/src/vitis/vas/doc/javascript/swagger-ui.min.js
similarity index 100%
rename from vmap/vas/doc/javascript/swagger-ui.min.js
rename to src/vitis/vas/doc/javascript/swagger-ui.min.js
diff --git a/vmap/vas/doc/javascript/underscore-min.js b/src/vitis/vas/doc/javascript/underscore-min.js
similarity index 100%
rename from vmap/vas/doc/javascript/underscore-min.js
rename to src/vitis/vas/doc/javascript/underscore-min.js
diff --git a/vmap/vas/doc/javascript/underscore-min.map b/src/vitis/vas/doc/javascript/underscore-min.map
similarity index 100%
rename from vmap/vas/doc/javascript/underscore-min.map
rename to src/vitis/vas/doc/javascript/underscore-min.map
diff --git a/vmap/vas/doc/swagger.php b/src/vitis/vas/doc/swagger.php
similarity index 100%
rename from vmap/vas/doc/swagger.php
rename to src/vitis/vas/doc/swagger.php
diff --git a/vmap/vas/doc/vendor/autoload.php b/src/vitis/vas/doc/vendor/autoload.php
similarity index 100%
rename from vmap/vas/doc/vendor/autoload.php
rename to src/vitis/vas/doc/vendor/autoload.php
diff --git a/vmap/vas/doc/vendor/bin/swagger b/src/vitis/vas/doc/vendor/bin/swagger
similarity index 100%
rename from vmap/vas/doc/vendor/bin/swagger
rename to src/vitis/vas/doc/vendor/bin/swagger
diff --git a/vmap/vas/doc/vendor/composer/ClassLoader.php b/src/vitis/vas/doc/vendor/composer/ClassLoader.php
similarity index 100%
rename from vmap/vas/doc/vendor/composer/ClassLoader.php
rename to src/vitis/vas/doc/vendor/composer/ClassLoader.php
diff --git a/vmap/vas/doc/vendor/composer/LICENSE b/src/vitis/vas/doc/vendor/composer/LICENSE
similarity index 100%
rename from vmap/vas/doc/vendor/composer/LICENSE
rename to src/vitis/vas/doc/vendor/composer/LICENSE
diff --git a/vmap/vas/doc/vendor/composer/autoload_classmap.php b/src/vitis/vas/doc/vendor/composer/autoload_classmap.php
similarity index 100%
rename from vmap/vas/doc/vendor/composer/autoload_classmap.php
rename to src/vitis/vas/doc/vendor/composer/autoload_classmap.php
diff --git a/vmap/vas/doc/vendor/composer/autoload_files.php b/src/vitis/vas/doc/vendor/composer/autoload_files.php
similarity index 100%
rename from vmap/vas/doc/vendor/composer/autoload_files.php
rename to src/vitis/vas/doc/vendor/composer/autoload_files.php
diff --git a/vmap/vas/doc/vendor/composer/autoload_namespaces.php b/src/vitis/vas/doc/vendor/composer/autoload_namespaces.php
similarity index 100%
rename from vmap/vas/doc/vendor/composer/autoload_namespaces.php
rename to src/vitis/vas/doc/vendor/composer/autoload_namespaces.php
diff --git a/vmap/vas/doc/vendor/composer/autoload_psr4.php b/src/vitis/vas/doc/vendor/composer/autoload_psr4.php
similarity index 100%
rename from vmap/vas/doc/vendor/composer/autoload_psr4.php
rename to src/vitis/vas/doc/vendor/composer/autoload_psr4.php
diff --git a/vmap/vas/doc/vendor/composer/autoload_real.php b/src/vitis/vas/doc/vendor/composer/autoload_real.php
similarity index 100%
rename from vmap/vas/doc/vendor/composer/autoload_real.php
rename to src/vitis/vas/doc/vendor/composer/autoload_real.php
diff --git a/vmap/vas/doc/vendor/composer/autoload_static.php b/src/vitis/vas/doc/vendor/composer/autoload_static.php
similarity index 100%
rename from vmap/vas/doc/vendor/composer/autoload_static.php
rename to src/vitis/vas/doc/vendor/composer/autoload_static.php
diff --git a/vmap/vas/doc/vendor/composer/installed.json b/src/vitis/vas/doc/vendor/composer/installed.json
similarity index 100%
rename from vmap/vas/doc/vendor/composer/installed.json
rename to src/vitis/vas/doc/vendor/composer/installed.json
diff --git a/vmap/vas/doc/vendor/doctrine/annotations/LICENSE b/src/vitis/vas/doc/vendor/doctrine/annotations/LICENSE
similarity index 100%
rename from vmap/vas/doc/vendor/doctrine/annotations/LICENSE
rename to src/vitis/vas/doc/vendor/doctrine/annotations/LICENSE
diff --git a/vmap/vas/doc/vendor/doctrine/annotations/README.md b/src/vitis/vas/doc/vendor/doctrine/annotations/README.md
similarity index 100%
rename from vmap/vas/doc/vendor/doctrine/annotations/README.md
rename to src/vitis/vas/doc/vendor/doctrine/annotations/README.md
diff --git a/vmap/vas/doc/vendor/doctrine/annotations/composer.json b/src/vitis/vas/doc/vendor/doctrine/annotations/composer.json
similarity index 100%
rename from vmap/vas/doc/vendor/doctrine/annotations/composer.json
rename to src/vitis/vas/doc/vendor/doctrine/annotations/composer.json
diff --git a/vmap/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation.php b/src/vitis/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation.php
similarity index 100%
rename from vmap/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation.php
rename to src/vitis/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation.php
diff --git a/vmap/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/Attribute.php b/src/vitis/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/Attribute.php
similarity index 100%
rename from vmap/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/Attribute.php
rename to src/vitis/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/Attribute.php
diff --git a/vmap/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/Attributes.php b/src/vitis/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/Attributes.php
similarity index 100%
rename from vmap/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/Attributes.php
rename to src/vitis/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/Attributes.php
diff --git a/vmap/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/Enum.php b/src/vitis/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/Enum.php
similarity index 100%
rename from vmap/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/Enum.php
rename to src/vitis/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/Enum.php
diff --git a/vmap/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/IgnoreAnnotation.php b/src/vitis/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/IgnoreAnnotation.php
similarity index 100%
rename from vmap/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/IgnoreAnnotation.php
rename to src/vitis/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/IgnoreAnnotation.php
diff --git a/vmap/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/Required.php b/src/vitis/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/Required.php
similarity index 100%
rename from vmap/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/Required.php
rename to src/vitis/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/Required.php
diff --git a/vmap/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/Target.php b/src/vitis/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/Target.php
similarity index 100%
rename from vmap/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/Target.php
rename to src/vitis/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/Target.php
diff --git a/vmap/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/AnnotationException.php b/src/vitis/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/AnnotationException.php
similarity index 100%
rename from vmap/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/AnnotationException.php
rename to src/vitis/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/AnnotationException.php
diff --git a/vmap/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/AnnotationReader.php b/src/vitis/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/AnnotationReader.php
similarity index 100%
rename from vmap/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/AnnotationReader.php
rename to src/vitis/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/AnnotationReader.php
diff --git a/vmap/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/AnnotationRegistry.php b/src/vitis/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/AnnotationRegistry.php
similarity index 100%
rename from vmap/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/AnnotationRegistry.php
rename to src/vitis/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/AnnotationRegistry.php
diff --git a/vmap/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/CachedReader.php b/src/vitis/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/CachedReader.php
similarity index 100%
rename from vmap/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/CachedReader.php
rename to src/vitis/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/CachedReader.php
diff --git a/vmap/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/DocLexer.php b/src/vitis/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/DocLexer.php
similarity index 100%
rename from vmap/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/DocLexer.php
rename to src/vitis/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/DocLexer.php
diff --git a/vmap/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/DocParser.php b/src/vitis/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/DocParser.php
similarity index 100%
rename from vmap/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/DocParser.php
rename to src/vitis/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/DocParser.php
diff --git a/vmap/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/FileCacheReader.php b/src/vitis/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/FileCacheReader.php
similarity index 100%
rename from vmap/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/FileCacheReader.php
rename to src/vitis/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/FileCacheReader.php
diff --git a/vmap/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/IndexedReader.php b/src/vitis/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/IndexedReader.php
similarity index 100%
rename from vmap/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/IndexedReader.php
rename to src/vitis/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/IndexedReader.php
diff --git a/vmap/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/PhpParser.php b/src/vitis/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/PhpParser.php
similarity index 100%
rename from vmap/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/PhpParser.php
rename to src/vitis/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/PhpParser.php
diff --git a/vmap/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Reader.php b/src/vitis/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Reader.php
similarity index 100%
rename from vmap/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Reader.php
rename to src/vitis/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Reader.php
diff --git a/vmap/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/SimpleAnnotationReader.php b/src/vitis/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/SimpleAnnotationReader.php
similarity index 100%
rename from vmap/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/SimpleAnnotationReader.php
rename to src/vitis/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/SimpleAnnotationReader.php
diff --git a/vmap/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/TokenParser.php b/src/vitis/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/TokenParser.php
similarity index 100%
rename from vmap/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/TokenParser.php
rename to src/vitis/vas/doc/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/TokenParser.php
diff --git a/vmap/vas/doc/vendor/doctrine/lexer/LICENSE b/src/vitis/vas/doc/vendor/doctrine/lexer/LICENSE
similarity index 100%
rename from vmap/vas/doc/vendor/doctrine/lexer/LICENSE
rename to src/vitis/vas/doc/vendor/doctrine/lexer/LICENSE
diff --git a/vmap/vas/doc/vendor/doctrine/lexer/README.md b/src/vitis/vas/doc/vendor/doctrine/lexer/README.md
similarity index 100%
rename from vmap/vas/doc/vendor/doctrine/lexer/README.md
rename to src/vitis/vas/doc/vendor/doctrine/lexer/README.md
diff --git a/vmap/vas/doc/vendor/doctrine/lexer/composer.json b/src/vitis/vas/doc/vendor/doctrine/lexer/composer.json
similarity index 100%
rename from vmap/vas/doc/vendor/doctrine/lexer/composer.json
rename to src/vitis/vas/doc/vendor/doctrine/lexer/composer.json
diff --git a/vmap/vas/doc/vendor/doctrine/lexer/lib/Doctrine/Common/Lexer/AbstractLexer.php b/src/vitis/vas/doc/vendor/doctrine/lexer/lib/Doctrine/Common/Lexer/AbstractLexer.php
similarity index 100%
rename from vmap/vas/doc/vendor/doctrine/lexer/lib/Doctrine/Common/Lexer/AbstractLexer.php
rename to src/vitis/vas/doc/vendor/doctrine/lexer/lib/Doctrine/Common/Lexer/AbstractLexer.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/.gitignore b/src/vitis/vas/doc/vendor/symfony/finder/.gitignore
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/.gitignore
rename to src/vitis/vas/doc/vendor/symfony/finder/.gitignore
diff --git a/vmap/vas/doc/vendor/symfony/finder/Adapter/AbstractAdapter.php b/src/vitis/vas/doc/vendor/symfony/finder/Adapter/AbstractAdapter.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Adapter/AbstractAdapter.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Adapter/AbstractAdapter.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Adapter/AbstractFindAdapter.php b/src/vitis/vas/doc/vendor/symfony/finder/Adapter/AbstractFindAdapter.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Adapter/AbstractFindAdapter.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Adapter/AbstractFindAdapter.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Adapter/AdapterInterface.php b/src/vitis/vas/doc/vendor/symfony/finder/Adapter/AdapterInterface.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Adapter/AdapterInterface.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Adapter/AdapterInterface.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Adapter/BsdFindAdapter.php b/src/vitis/vas/doc/vendor/symfony/finder/Adapter/BsdFindAdapter.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Adapter/BsdFindAdapter.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Adapter/BsdFindAdapter.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Adapter/GnuFindAdapter.php b/src/vitis/vas/doc/vendor/symfony/finder/Adapter/GnuFindAdapter.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Adapter/GnuFindAdapter.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Adapter/GnuFindAdapter.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Adapter/PhpAdapter.php b/src/vitis/vas/doc/vendor/symfony/finder/Adapter/PhpAdapter.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Adapter/PhpAdapter.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Adapter/PhpAdapter.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/CHANGELOG.md b/src/vitis/vas/doc/vendor/symfony/finder/CHANGELOG.md
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/CHANGELOG.md
rename to src/vitis/vas/doc/vendor/symfony/finder/CHANGELOG.md
diff --git a/vmap/vas/doc/vendor/symfony/finder/Comparator/Comparator.php b/src/vitis/vas/doc/vendor/symfony/finder/Comparator/Comparator.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Comparator/Comparator.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Comparator/Comparator.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Comparator/DateComparator.php b/src/vitis/vas/doc/vendor/symfony/finder/Comparator/DateComparator.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Comparator/DateComparator.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Comparator/DateComparator.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Comparator/NumberComparator.php b/src/vitis/vas/doc/vendor/symfony/finder/Comparator/NumberComparator.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Comparator/NumberComparator.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Comparator/NumberComparator.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Exception/AccessDeniedException.php b/src/vitis/vas/doc/vendor/symfony/finder/Exception/AccessDeniedException.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Exception/AccessDeniedException.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Exception/AccessDeniedException.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Exception/AdapterFailureException.php b/src/vitis/vas/doc/vendor/symfony/finder/Exception/AdapterFailureException.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Exception/AdapterFailureException.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Exception/AdapterFailureException.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Exception/ExceptionInterface.php b/src/vitis/vas/doc/vendor/symfony/finder/Exception/ExceptionInterface.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Exception/ExceptionInterface.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Exception/ExceptionInterface.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Exception/OperationNotPermitedException.php b/src/vitis/vas/doc/vendor/symfony/finder/Exception/OperationNotPermitedException.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Exception/OperationNotPermitedException.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Exception/OperationNotPermitedException.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Exception/ShellCommandFailureException.php b/src/vitis/vas/doc/vendor/symfony/finder/Exception/ShellCommandFailureException.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Exception/ShellCommandFailureException.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Exception/ShellCommandFailureException.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Expression/Expression.php b/src/vitis/vas/doc/vendor/symfony/finder/Expression/Expression.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Expression/Expression.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Expression/Expression.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Expression/Glob.php b/src/vitis/vas/doc/vendor/symfony/finder/Expression/Glob.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Expression/Glob.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Expression/Glob.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Expression/Regex.php b/src/vitis/vas/doc/vendor/symfony/finder/Expression/Regex.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Expression/Regex.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Expression/Regex.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Expression/ValueInterface.php b/src/vitis/vas/doc/vendor/symfony/finder/Expression/ValueInterface.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Expression/ValueInterface.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Expression/ValueInterface.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Finder.php b/src/vitis/vas/doc/vendor/symfony/finder/Finder.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Finder.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Finder.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Glob.php b/src/vitis/vas/doc/vendor/symfony/finder/Glob.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Glob.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Glob.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Iterator/CustomFilterIterator.php b/src/vitis/vas/doc/vendor/symfony/finder/Iterator/CustomFilterIterator.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Iterator/CustomFilterIterator.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Iterator/CustomFilterIterator.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Iterator/DateRangeFilterIterator.php b/src/vitis/vas/doc/vendor/symfony/finder/Iterator/DateRangeFilterIterator.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Iterator/DateRangeFilterIterator.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Iterator/DateRangeFilterIterator.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Iterator/DepthRangeFilterIterator.php b/src/vitis/vas/doc/vendor/symfony/finder/Iterator/DepthRangeFilterIterator.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Iterator/DepthRangeFilterIterator.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Iterator/DepthRangeFilterIterator.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Iterator/ExcludeDirectoryFilterIterator.php b/src/vitis/vas/doc/vendor/symfony/finder/Iterator/ExcludeDirectoryFilterIterator.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Iterator/ExcludeDirectoryFilterIterator.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Iterator/ExcludeDirectoryFilterIterator.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Iterator/FilePathsIterator.php b/src/vitis/vas/doc/vendor/symfony/finder/Iterator/FilePathsIterator.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Iterator/FilePathsIterator.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Iterator/FilePathsIterator.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Iterator/FileTypeFilterIterator.php b/src/vitis/vas/doc/vendor/symfony/finder/Iterator/FileTypeFilterIterator.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Iterator/FileTypeFilterIterator.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Iterator/FileTypeFilterIterator.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Iterator/FilecontentFilterIterator.php b/src/vitis/vas/doc/vendor/symfony/finder/Iterator/FilecontentFilterIterator.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Iterator/FilecontentFilterIterator.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Iterator/FilecontentFilterIterator.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Iterator/FilenameFilterIterator.php b/src/vitis/vas/doc/vendor/symfony/finder/Iterator/FilenameFilterIterator.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Iterator/FilenameFilterIterator.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Iterator/FilenameFilterIterator.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Iterator/FilterIterator.php b/src/vitis/vas/doc/vendor/symfony/finder/Iterator/FilterIterator.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Iterator/FilterIterator.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Iterator/FilterIterator.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Iterator/MultiplePcreFilterIterator.php b/src/vitis/vas/doc/vendor/symfony/finder/Iterator/MultiplePcreFilterIterator.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Iterator/MultiplePcreFilterIterator.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Iterator/MultiplePcreFilterIterator.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Iterator/PathFilterIterator.php b/src/vitis/vas/doc/vendor/symfony/finder/Iterator/PathFilterIterator.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Iterator/PathFilterIterator.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Iterator/PathFilterIterator.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Iterator/RecursiveDirectoryIterator.php b/src/vitis/vas/doc/vendor/symfony/finder/Iterator/RecursiveDirectoryIterator.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Iterator/RecursiveDirectoryIterator.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Iterator/RecursiveDirectoryIterator.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Iterator/SizeRangeFilterIterator.php b/src/vitis/vas/doc/vendor/symfony/finder/Iterator/SizeRangeFilterIterator.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Iterator/SizeRangeFilterIterator.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Iterator/SizeRangeFilterIterator.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Iterator/SortableIterator.php b/src/vitis/vas/doc/vendor/symfony/finder/Iterator/SortableIterator.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Iterator/SortableIterator.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Iterator/SortableIterator.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/LICENSE b/src/vitis/vas/doc/vendor/symfony/finder/LICENSE
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/LICENSE
rename to src/vitis/vas/doc/vendor/symfony/finder/LICENSE
diff --git a/vmap/vas/doc/vendor/symfony/finder/README.md b/src/vitis/vas/doc/vendor/symfony/finder/README.md
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/README.md
rename to src/vitis/vas/doc/vendor/symfony/finder/README.md
diff --git a/vmap/vas/doc/vendor/symfony/finder/Shell/Command.php b/src/vitis/vas/doc/vendor/symfony/finder/Shell/Command.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Shell/Command.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Shell/Command.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Shell/Shell.php b/src/vitis/vas/doc/vendor/symfony/finder/Shell/Shell.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Shell/Shell.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Shell/Shell.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/SplFileInfo.php b/src/vitis/vas/doc/vendor/symfony/finder/SplFileInfo.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/SplFileInfo.php
rename to src/vitis/vas/doc/vendor/symfony/finder/SplFileInfo.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Tests/BsdFinderTest.php b/src/vitis/vas/doc/vendor/symfony/finder/Tests/BsdFinderTest.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Tests/BsdFinderTest.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Tests/BsdFinderTest.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Tests/Comparator/ComparatorTest.php b/src/vitis/vas/doc/vendor/symfony/finder/Tests/Comparator/ComparatorTest.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Tests/Comparator/ComparatorTest.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Tests/Comparator/ComparatorTest.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Tests/Comparator/DateComparatorTest.php b/src/vitis/vas/doc/vendor/symfony/finder/Tests/Comparator/DateComparatorTest.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Tests/Comparator/DateComparatorTest.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Tests/Comparator/DateComparatorTest.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Tests/Comparator/NumberComparatorTest.php b/src/vitis/vas/doc/vendor/symfony/finder/Tests/Comparator/NumberComparatorTest.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Tests/Comparator/NumberComparatorTest.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Tests/Comparator/NumberComparatorTest.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Tests/Expression/ExpressionTest.php b/src/vitis/vas/doc/vendor/symfony/finder/Tests/Expression/ExpressionTest.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Tests/Expression/ExpressionTest.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Tests/Expression/ExpressionTest.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Tests/Expression/GlobTest.php b/src/vitis/vas/doc/vendor/symfony/finder/Tests/Expression/GlobTest.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Tests/Expression/GlobTest.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Tests/Expression/GlobTest.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Tests/Expression/RegexTest.php b/src/vitis/vas/doc/vendor/symfony/finder/Tests/Expression/RegexTest.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Tests/Expression/RegexTest.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Tests/Expression/RegexTest.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Tests/FakeAdapter/DummyAdapter.php b/src/vitis/vas/doc/vendor/symfony/finder/Tests/FakeAdapter/DummyAdapter.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Tests/FakeAdapter/DummyAdapter.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Tests/FakeAdapter/DummyAdapter.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Tests/FakeAdapter/FailingAdapter.php b/src/vitis/vas/doc/vendor/symfony/finder/Tests/FakeAdapter/FailingAdapter.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Tests/FakeAdapter/FailingAdapter.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Tests/FakeAdapter/FailingAdapter.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Tests/FakeAdapter/NamedAdapter.php b/src/vitis/vas/doc/vendor/symfony/finder/Tests/FakeAdapter/NamedAdapter.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Tests/FakeAdapter/NamedAdapter.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Tests/FakeAdapter/NamedAdapter.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Tests/FakeAdapter/UnsupportedAdapter.php b/src/vitis/vas/doc/vendor/symfony/finder/Tests/FakeAdapter/UnsupportedAdapter.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Tests/FakeAdapter/UnsupportedAdapter.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Tests/FakeAdapter/UnsupportedAdapter.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Tests/FinderTest.php b/src/vitis/vas/doc/vendor/symfony/finder/Tests/FinderTest.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Tests/FinderTest.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Tests/FinderTest.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Tests/Fixtures/A/B/ab.dat b/src/vitis/vas/doc/vendor/symfony/finder/Tests/Fixtures/A/B/C/abc.dat
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Tests/Fixtures/A/B/ab.dat
rename to src/vitis/vas/doc/vendor/symfony/finder/Tests/Fixtures/A/B/C/abc.dat
diff --git a/vmap/vas/doc/vendor/symfony/finder/Tests/Fixtures/A/a.dat b/src/vitis/vas/doc/vendor/symfony/finder/Tests/Fixtures/A/B/ab.dat
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Tests/Fixtures/A/a.dat
rename to src/vitis/vas/doc/vendor/symfony/finder/Tests/Fixtures/A/B/ab.dat
diff --git a/vmap/vas/doc/vendor/symfony/finder/Tests/Fixtures/copy/A/B/C/abc.dat.copy b/src/vitis/vas/doc/vendor/symfony/finder/Tests/Fixtures/A/a.dat
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Tests/Fixtures/copy/A/B/C/abc.dat.copy
rename to src/vitis/vas/doc/vendor/symfony/finder/Tests/Fixtures/A/a.dat
diff --git a/vmap/vas/doc/vendor/symfony/finder/Tests/Fixtures/copy/A/B/ab.dat.copy b/src/vitis/vas/doc/vendor/symfony/finder/Tests/Fixtures/copy/A/B/C/abc.dat.copy
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Tests/Fixtures/copy/A/B/ab.dat.copy
rename to src/vitis/vas/doc/vendor/symfony/finder/Tests/Fixtures/copy/A/B/C/abc.dat.copy
diff --git a/vmap/vas/doc/vendor/symfony/finder/Tests/Fixtures/copy/A/a.dat.copy b/src/vitis/vas/doc/vendor/symfony/finder/Tests/Fixtures/copy/A/B/ab.dat.copy
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Tests/Fixtures/copy/A/a.dat.copy
rename to src/vitis/vas/doc/vendor/symfony/finder/Tests/Fixtures/copy/A/B/ab.dat.copy
diff --git a/vmap/vas/doc/vendor/symfony/finder/Tests/Fixtures/one/a b/src/vitis/vas/doc/vendor/symfony/finder/Tests/Fixtures/copy/A/a.dat.copy
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Tests/Fixtures/one/a
rename to src/vitis/vas/doc/vendor/symfony/finder/Tests/Fixtures/copy/A/a.dat.copy
diff --git a/vmap/vas/doc/vendor/symfony/finder/Tests/Fixtures/dolor.txt b/src/vitis/vas/doc/vendor/symfony/finder/Tests/Fixtures/dolor.txt
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Tests/Fixtures/dolor.txt
rename to src/vitis/vas/doc/vendor/symfony/finder/Tests/Fixtures/dolor.txt
diff --git a/vmap/vas/doc/vendor/symfony/finder/Tests/Fixtures/ipsum.txt b/src/vitis/vas/doc/vendor/symfony/finder/Tests/Fixtures/ipsum.txt
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Tests/Fixtures/ipsum.txt
rename to src/vitis/vas/doc/vendor/symfony/finder/Tests/Fixtures/ipsum.txt
diff --git a/vmap/vas/doc/vendor/symfony/finder/Tests/Fixtures/lorem.txt b/src/vitis/vas/doc/vendor/symfony/finder/Tests/Fixtures/lorem.txt
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Tests/Fixtures/lorem.txt
rename to src/vitis/vas/doc/vendor/symfony/finder/Tests/Fixtures/lorem.txt
diff --git a/vmap/vas/doc/vendor/symfony/finder/Tests/Fixtures/one/b/c.neon b/src/vitis/vas/doc/vendor/symfony/finder/Tests/Fixtures/one/a
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Tests/Fixtures/one/b/c.neon
rename to src/vitis/vas/doc/vendor/symfony/finder/Tests/Fixtures/one/a
diff --git a/vmap/vas/doc/vendor/symfony/finder/Tests/Fixtures/one/b/d.neon b/src/vitis/vas/doc/vendor/symfony/finder/Tests/Fixtures/one/b/c.neon
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Tests/Fixtures/one/b/d.neon
rename to src/vitis/vas/doc/vendor/symfony/finder/Tests/Fixtures/one/b/c.neon
diff --git a/vmap/vas/doc/vendor/symfony/finder/Tests/Fixtures/r+e.gex[c]a(r)s/dir/bar.dat b/src/vitis/vas/doc/vendor/symfony/finder/Tests/Fixtures/one/b/d.neon
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Tests/Fixtures/r+e.gex[c]a(r)s/dir/bar.dat
rename to src/vitis/vas/doc/vendor/symfony/finder/Tests/Fixtures/one/b/d.neon
diff --git a/vmap/vas/doc/vendor/symfony/finder/Tests/Fixtures/with space/foo.txt b/src/vitis/vas/doc/vendor/symfony/finder/Tests/Fixtures/r+e.gex[c]a(r)s/dir/bar.dat
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Tests/Fixtures/with space/foo.txt
rename to src/vitis/vas/doc/vendor/symfony/finder/Tests/Fixtures/r+e.gex[c]a(r)s/dir/bar.dat
diff --git a/vmap/vas/tmp/file_to_delete.txt b/src/vitis/vas/doc/vendor/symfony/finder/Tests/Fixtures/with space/foo.txt
similarity index 100%
rename from vmap/vas/tmp/file_to_delete.txt
rename to src/vitis/vas/doc/vendor/symfony/finder/Tests/Fixtures/with space/foo.txt
diff --git a/vmap/vas/doc/vendor/symfony/finder/Tests/GlobTest.php b/src/vitis/vas/doc/vendor/symfony/finder/Tests/GlobTest.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Tests/GlobTest.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Tests/GlobTest.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Tests/GnuFinderTest.php b/src/vitis/vas/doc/vendor/symfony/finder/Tests/GnuFinderTest.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Tests/GnuFinderTest.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Tests/GnuFinderTest.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Tests/Iterator/CustomFilterIteratorTest.php b/src/vitis/vas/doc/vendor/symfony/finder/Tests/Iterator/CustomFilterIteratorTest.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Tests/Iterator/CustomFilterIteratorTest.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Tests/Iterator/CustomFilterIteratorTest.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Tests/Iterator/DateRangeFilterIteratorTest.php b/src/vitis/vas/doc/vendor/symfony/finder/Tests/Iterator/DateRangeFilterIteratorTest.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Tests/Iterator/DateRangeFilterIteratorTest.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Tests/Iterator/DateRangeFilterIteratorTest.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Tests/Iterator/DepthRangeFilterIteratorTest.php b/src/vitis/vas/doc/vendor/symfony/finder/Tests/Iterator/DepthRangeFilterIteratorTest.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Tests/Iterator/DepthRangeFilterIteratorTest.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Tests/Iterator/DepthRangeFilterIteratorTest.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Tests/Iterator/ExcludeDirectoryFilterIteratorTest.php b/src/vitis/vas/doc/vendor/symfony/finder/Tests/Iterator/ExcludeDirectoryFilterIteratorTest.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Tests/Iterator/ExcludeDirectoryFilterIteratorTest.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Tests/Iterator/ExcludeDirectoryFilterIteratorTest.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Tests/Iterator/FilePathsIteratorTest.php b/src/vitis/vas/doc/vendor/symfony/finder/Tests/Iterator/FilePathsIteratorTest.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Tests/Iterator/FilePathsIteratorTest.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Tests/Iterator/FilePathsIteratorTest.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Tests/Iterator/FileTypeFilterIteratorTest.php b/src/vitis/vas/doc/vendor/symfony/finder/Tests/Iterator/FileTypeFilterIteratorTest.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Tests/Iterator/FileTypeFilterIteratorTest.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Tests/Iterator/FileTypeFilterIteratorTest.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Tests/Iterator/FilecontentFilterIteratorTest.php b/src/vitis/vas/doc/vendor/symfony/finder/Tests/Iterator/FilecontentFilterIteratorTest.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Tests/Iterator/FilecontentFilterIteratorTest.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Tests/Iterator/FilecontentFilterIteratorTest.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Tests/Iterator/FilenameFilterIteratorTest.php b/src/vitis/vas/doc/vendor/symfony/finder/Tests/Iterator/FilenameFilterIteratorTest.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Tests/Iterator/FilenameFilterIteratorTest.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Tests/Iterator/FilenameFilterIteratorTest.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Tests/Iterator/FilterIteratorTest.php b/src/vitis/vas/doc/vendor/symfony/finder/Tests/Iterator/FilterIteratorTest.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Tests/Iterator/FilterIteratorTest.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Tests/Iterator/FilterIteratorTest.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Tests/Iterator/Iterator.php b/src/vitis/vas/doc/vendor/symfony/finder/Tests/Iterator/Iterator.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Tests/Iterator/Iterator.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Tests/Iterator/Iterator.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Tests/Iterator/IteratorTestCase.php b/src/vitis/vas/doc/vendor/symfony/finder/Tests/Iterator/IteratorTestCase.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Tests/Iterator/IteratorTestCase.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Tests/Iterator/IteratorTestCase.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Tests/Iterator/MockFileListIterator.php b/src/vitis/vas/doc/vendor/symfony/finder/Tests/Iterator/MockFileListIterator.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Tests/Iterator/MockFileListIterator.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Tests/Iterator/MockFileListIterator.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Tests/Iterator/MockSplFileInfo.php b/src/vitis/vas/doc/vendor/symfony/finder/Tests/Iterator/MockSplFileInfo.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Tests/Iterator/MockSplFileInfo.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Tests/Iterator/MockSplFileInfo.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Tests/Iterator/MultiplePcreFilterIteratorTest.php b/src/vitis/vas/doc/vendor/symfony/finder/Tests/Iterator/MultiplePcreFilterIteratorTest.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Tests/Iterator/MultiplePcreFilterIteratorTest.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Tests/Iterator/MultiplePcreFilterIteratorTest.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Tests/Iterator/PathFilterIteratorTest.php b/src/vitis/vas/doc/vendor/symfony/finder/Tests/Iterator/PathFilterIteratorTest.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Tests/Iterator/PathFilterIteratorTest.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Tests/Iterator/PathFilterIteratorTest.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Tests/Iterator/RealIteratorTestCase.php b/src/vitis/vas/doc/vendor/symfony/finder/Tests/Iterator/RealIteratorTestCase.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Tests/Iterator/RealIteratorTestCase.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Tests/Iterator/RealIteratorTestCase.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Tests/Iterator/RecursiveDirectoryIteratorTest.php b/src/vitis/vas/doc/vendor/symfony/finder/Tests/Iterator/RecursiveDirectoryIteratorTest.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Tests/Iterator/RecursiveDirectoryIteratorTest.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Tests/Iterator/RecursiveDirectoryIteratorTest.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Tests/Iterator/SizeRangeFilterIteratorTest.php b/src/vitis/vas/doc/vendor/symfony/finder/Tests/Iterator/SizeRangeFilterIteratorTest.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Tests/Iterator/SizeRangeFilterIteratorTest.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Tests/Iterator/SizeRangeFilterIteratorTest.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Tests/Iterator/SortableIteratorTest.php b/src/vitis/vas/doc/vendor/symfony/finder/Tests/Iterator/SortableIteratorTest.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Tests/Iterator/SortableIteratorTest.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Tests/Iterator/SortableIteratorTest.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/Tests/Shell/CommandTest.php b/src/vitis/vas/doc/vendor/symfony/finder/Tests/Shell/CommandTest.php
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/Tests/Shell/CommandTest.php
rename to src/vitis/vas/doc/vendor/symfony/finder/Tests/Shell/CommandTest.php
diff --git a/vmap/vas/doc/vendor/symfony/finder/composer.json b/src/vitis/vas/doc/vendor/symfony/finder/composer.json
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/composer.json
rename to src/vitis/vas/doc/vendor/symfony/finder/composer.json
diff --git a/vmap/vas/doc/vendor/symfony/finder/phpunit.xml.dist b/src/vitis/vas/doc/vendor/symfony/finder/phpunit.xml.dist
similarity index 100%
rename from vmap/vas/doc/vendor/symfony/finder/phpunit.xml.dist
rename to src/vitis/vas/doc/vendor/symfony/finder/phpunit.xml.dist
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/.gitignore b/src/vitis/vas/doc/vendor/zircote/swagger-php/.gitignore
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/.gitignore
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/.gitignore
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/.travis.yml b/src/vitis/vas/doc/vendor/zircote/swagger-php/.travis.yml
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/.travis.yml
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/.travis.yml
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/Changelog.md b/src/vitis/vas/doc/vendor/zircote/swagger-php/Changelog.md
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/Changelog.md
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/Changelog.md
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/Examples/Examples.md b/src/vitis/vas/doc/vendor/zircote/swagger-php/Examples/Examples.md
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/Examples/Examples.md
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/Examples/Examples.md
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/Examples/petstore.swagger.io/ApiResponse.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/Examples/petstore.swagger.io/ApiResponse.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/Examples/petstore.swagger.io/ApiResponse.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/Examples/petstore.swagger.io/ApiResponse.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/Examples/petstore.swagger.io/controllers/PetController.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/Examples/petstore.swagger.io/controllers/PetController.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/Examples/petstore.swagger.io/controllers/PetController.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/Examples/petstore.swagger.io/controllers/PetController.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/Examples/petstore.swagger.io/controllers/StoreController.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/Examples/petstore.swagger.io/controllers/StoreController.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/Examples/petstore.swagger.io/controllers/StoreController.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/Examples/petstore.swagger.io/controllers/StoreController.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/Examples/petstore.swagger.io/controllers/UserController.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/Examples/petstore.swagger.io/controllers/UserController.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/Examples/petstore.swagger.io/controllers/UserController.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/Examples/petstore.swagger.io/controllers/UserController.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/Examples/petstore.swagger.io/models/Category.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/Examples/petstore.swagger.io/models/Category.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/Examples/petstore.swagger.io/models/Category.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/Examples/petstore.swagger.io/models/Category.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/Examples/petstore.swagger.io/models/Order.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/Examples/petstore.swagger.io/models/Order.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/Examples/petstore.swagger.io/models/Order.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/Examples/petstore.swagger.io/models/Order.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/Examples/petstore.swagger.io/models/Pet.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/Examples/petstore.swagger.io/models/Pet.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/Examples/petstore.swagger.io/models/Pet.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/Examples/petstore.swagger.io/models/Pet.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/Examples/petstore.swagger.io/models/Tag.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/Examples/petstore.swagger.io/models/Tag.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/Examples/petstore.swagger.io/models/Tag.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/Examples/petstore.swagger.io/models/Tag.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/Examples/petstore.swagger.io/models/User.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/Examples/petstore.swagger.io/models/User.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/Examples/petstore.swagger.io/models/User.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/Examples/petstore.swagger.io/models/User.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/Examples/petstore.swagger.io/security.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/Examples/petstore.swagger.io/security.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/Examples/petstore.swagger.io/security.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/Examples/petstore.swagger.io/security.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/Examples/petstore.swagger.io/swagger-v2.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/Examples/petstore.swagger.io/swagger-v2.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/Examples/petstore.swagger.io/swagger-v2.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/Examples/petstore.swagger.io/swagger-v2.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/Examples/petstore.swagger.io/tags.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/Examples/petstore.swagger.io/tags.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/Examples/petstore.swagger.io/tags.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/Examples/petstore.swagger.io/tags.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/Examples/swagger-spec/petstore-simple/SimplePet.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/Examples/swagger-spec/petstore-simple/SimplePet.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/Examples/swagger-spec/petstore-simple/SimplePet.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/Examples/swagger-spec/petstore-simple/SimplePet.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/Examples/swagger-spec/petstore-simple/SimplePetsController.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/Examples/swagger-spec/petstore-simple/SimplePetsController.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/Examples/swagger-spec/petstore-simple/SimplePetsController.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/Examples/swagger-spec/petstore-simple/SimplePetsController.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/Examples/swagger-spec/petstore-simple/api.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/Examples/swagger-spec/petstore-simple/api.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/Examples/swagger-spec/petstore-simple/api.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/Examples/swagger-spec/petstore-simple/api.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/Examples/swagger-spec/petstore-with-external-docs/controllers/PetWithDocsController.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/Examples/swagger-spec/petstore-with-external-docs/controllers/PetWithDocsController.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/Examples/swagger-spec/petstore-with-external-docs/controllers/PetWithDocsController.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/Examples/swagger-spec/petstore-with-external-docs/controllers/PetWithDocsController.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/Examples/swagger-spec/petstore-with-external-docs/docs.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/Examples/swagger-spec/petstore-with-external-docs/docs.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/Examples/swagger-spec/petstore-with-external-docs/docs.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/Examples/swagger-spec/petstore-with-external-docs/docs.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/Examples/swagger-spec/petstore-with-external-docs/models/ErrorModel.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/Examples/swagger-spec/petstore-with-external-docs/models/ErrorModel.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/Examples/swagger-spec/petstore-with-external-docs/models/ErrorModel.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/Examples/swagger-spec/petstore-with-external-docs/models/ErrorModel.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/Examples/swagger-spec/petstore-with-external-docs/models/Pet.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/Examples/swagger-spec/petstore-with-external-docs/models/Pet.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/Examples/swagger-spec/petstore-with-external-docs/models/Pet.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/Examples/swagger-spec/petstore-with-external-docs/models/Pet.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/Examples/swagger-spec/petstore/Pet.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/Examples/swagger-spec/petstore/Pet.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/Examples/swagger-spec/petstore/Pet.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/Examples/swagger-spec/petstore/Pet.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/Examples/swagger-spec/petstore/PetsController.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/Examples/swagger-spec/petstore/PetsController.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/Examples/swagger-spec/petstore/PetsController.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/Examples/swagger-spec/petstore/PetsController.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/Examples/swagger-spec/petstore/api.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/Examples/swagger-spec/petstore/api.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/Examples/swagger-spec/petstore/api.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/Examples/swagger-spec/petstore/api.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/LICENSE-2.0.txt b/src/vitis/vas/doc/vendor/zircote/swagger-php/LICENSE-2.0.txt
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/LICENSE-2.0.txt
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/LICENSE-2.0.txt
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/README.md b/src/vitis/vas/doc/vendor/zircote/swagger-php/README.md
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/README.md
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/README.md
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/VERSION b/src/vitis/vas/doc/vendor/zircote/swagger-php/VERSION
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/VERSION
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/VERSION
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/bin/swagger b/src/vitis/vas/doc/vendor/zircote/swagger-php/bin/swagger
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/bin/swagger
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/bin/swagger
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/composer.json b/src/vitis/vas/doc/vendor/zircote/swagger-php/composer.json
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/composer.json
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/composer.json
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/docs/Advanced.md b/src/vitis/vas/doc/vendor/zircote/swagger-php/docs/Advanced.md
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/docs/Advanced.md
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/docs/Advanced.md
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/docs/Getting-started.md b/src/vitis/vas/doc/vendor/zircote/swagger-php/docs/Getting-started.md
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/docs/Getting-started.md
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/docs/Getting-started.md
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/docs/Migrating-to-v2.md b/src/vitis/vas/doc/vendor/zircote/swagger-php/docs/Migrating-to-v2.md
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/docs/Migrating-to-v2.md
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/docs/Migrating-to-v2.md
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/docs/Related-projects.md b/src/vitis/vas/doc/vendor/zircote/swagger-php/docs/Related-projects.md
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/docs/Related-projects.md
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/docs/Related-projects.md
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/phpunit.xml.dist b/src/vitis/vas/doc/vendor/zircote/swagger-php/phpunit.xml.dist
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/phpunit.xml.dist
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/phpunit.xml.dist
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/src/Analyser.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/src/Analyser.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/src/Analyser.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/src/Analyser.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/src/Analysis.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/src/Analysis.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/src/Analysis.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/src/Analysis.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/src/Annotations/AbstractAnnotation.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/src/Annotations/AbstractAnnotation.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/src/Annotations/AbstractAnnotation.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/src/Annotations/AbstractAnnotation.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/src/Annotations/Contact.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/src/Annotations/Contact.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/src/Annotations/Contact.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/src/Annotations/Contact.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/src/Annotations/Definition.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/src/Annotations/Definition.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/src/Annotations/Definition.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/src/Annotations/Definition.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/src/Annotations/Delete.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/src/Annotations/Delete.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/src/Annotations/Delete.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/src/Annotations/Delete.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/src/Annotations/ExternalDocumentation.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/src/Annotations/ExternalDocumentation.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/src/Annotations/ExternalDocumentation.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/src/Annotations/ExternalDocumentation.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/src/Annotations/Get.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/src/Annotations/Get.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/src/Annotations/Get.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/src/Annotations/Get.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/src/Annotations/Head.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/src/Annotations/Head.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/src/Annotations/Head.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/src/Annotations/Head.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/src/Annotations/Header.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/src/Annotations/Header.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/src/Annotations/Header.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/src/Annotations/Header.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/src/Annotations/Info.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/src/Annotations/Info.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/src/Annotations/Info.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/src/Annotations/Info.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/src/Annotations/Items.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/src/Annotations/Items.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/src/Annotations/Items.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/src/Annotations/Items.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/src/Annotations/License.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/src/Annotations/License.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/src/Annotations/License.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/src/Annotations/License.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/src/Annotations/Operation.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/src/Annotations/Operation.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/src/Annotations/Operation.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/src/Annotations/Operation.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/src/Annotations/Options.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/src/Annotations/Options.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/src/Annotations/Options.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/src/Annotations/Options.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/src/Annotations/Parameter.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/src/Annotations/Parameter.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/src/Annotations/Parameter.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/src/Annotations/Parameter.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/src/Annotations/Patch.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/src/Annotations/Patch.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/src/Annotations/Patch.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/src/Annotations/Patch.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/src/Annotations/Path.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/src/Annotations/Path.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/src/Annotations/Path.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/src/Annotations/Path.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/src/Annotations/Post.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/src/Annotations/Post.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/src/Annotations/Post.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/src/Annotations/Post.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/src/Annotations/Property.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/src/Annotations/Property.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/src/Annotations/Property.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/src/Annotations/Property.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/src/Annotations/Put.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/src/Annotations/Put.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/src/Annotations/Put.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/src/Annotations/Put.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/src/Annotations/Response.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/src/Annotations/Response.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/src/Annotations/Response.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/src/Annotations/Response.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/src/Annotations/Schema.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/src/Annotations/Schema.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/src/Annotations/Schema.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/src/Annotations/Schema.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/src/Annotations/SecurityScheme.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/src/Annotations/SecurityScheme.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/src/Annotations/SecurityScheme.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/src/Annotations/SecurityScheme.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/src/Annotations/Swagger.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/src/Annotations/Swagger.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/src/Annotations/Swagger.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/src/Annotations/Swagger.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/src/Annotations/Tag.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/src/Annotations/Tag.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/src/Annotations/Tag.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/src/Annotations/Tag.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/src/Annotations/Xml.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/src/Annotations/Xml.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/src/Annotations/Xml.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/src/Annotations/Xml.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/src/Context.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/src/Context.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/src/Context.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/src/Context.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/src/Logger.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/src/Logger.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/src/Logger.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/src/Logger.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/src/Processors/AugmentDefinitions.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/src/Processors/AugmentDefinitions.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/src/Processors/AugmentDefinitions.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/src/Processors/AugmentDefinitions.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/src/Processors/AugmentOperations.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/src/Processors/AugmentOperations.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/src/Processors/AugmentOperations.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/src/Processors/AugmentOperations.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/src/Processors/AugmentParameters.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/src/Processors/AugmentParameters.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/src/Processors/AugmentParameters.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/src/Processors/AugmentParameters.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/src/Processors/AugmentProperties.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/src/Processors/AugmentProperties.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/src/Processors/AugmentProperties.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/src/Processors/AugmentProperties.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/src/Processors/BuildPaths.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/src/Processors/BuildPaths.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/src/Processors/BuildPaths.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/src/Processors/BuildPaths.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/src/Processors/CleanUnmerged.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/src/Processors/CleanUnmerged.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/src/Processors/CleanUnmerged.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/src/Processors/CleanUnmerged.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/src/Processors/HandleReferences.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/src/Processors/HandleReferences.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/src/Processors/HandleReferences.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/src/Processors/HandleReferences.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/src/Processors/InheritProperties.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/src/Processors/InheritProperties.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/src/Processors/InheritProperties.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/src/Processors/InheritProperties.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/src/Processors/MergeIntoSwagger.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/src/Processors/MergeIntoSwagger.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/src/Processors/MergeIntoSwagger.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/src/Processors/MergeIntoSwagger.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/src/Serializer.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/src/Serializer.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/src/Serializer.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/src/Serializer.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/src/StaticAnalyser.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/src/StaticAnalyser.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/src/StaticAnalyser.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/src/StaticAnalyser.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/src/Util.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/src/Util.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/src/Util.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/src/Util.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/src/functions.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/src/functions.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/src/functions.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/src/functions.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/tests/AbstractAnnotationTest.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/tests/AbstractAnnotationTest.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/tests/AbstractAnnotationTest.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/tests/AbstractAnnotationTest.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/tests/AnalyserTest.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/tests/AnalyserTest.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/tests/AnalyserTest.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/tests/AnalyserTest.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/tests/AnalysisTest.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/tests/AnalysisTest.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/tests/AnalysisTest.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/tests/AnalysisTest.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/tests/AugmentDefinitionsTest.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/tests/AugmentDefinitionsTest.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/tests/AugmentDefinitionsTest.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/tests/AugmentDefinitionsTest.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/tests/AugmentOperationTest.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/tests/AugmentOperationTest.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/tests/AugmentOperationTest.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/tests/AugmentOperationTest.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/tests/AugmentParameterTest.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/tests/AugmentParameterTest.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/tests/AugmentParameterTest.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/tests/AugmentParameterTest.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/tests/AugmentPropertiesTest.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/tests/AugmentPropertiesTest.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/tests/AugmentPropertiesTest.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/tests/AugmentPropertiesTest.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/tests/BuildPathsTest.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/tests/BuildPathsTest.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/tests/BuildPathsTest.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/tests/BuildPathsTest.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/tests/CleanUnmergedTest.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/tests/CleanUnmergedTest.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/tests/CleanUnmergedTest.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/tests/CleanUnmergedTest.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/tests/CommandlineInterfaceTest.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/tests/CommandlineInterfaceTest.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/tests/CommandlineInterfaceTest.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/tests/CommandlineInterfaceTest.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/tests/ConstantsTest.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/tests/ConstantsTest.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/tests/ConstantsTest.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/tests/ConstantsTest.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/tests/ContextTest.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/tests/ContextTest.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/tests/ContextTest.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/tests/ContextTest.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/tests/ExamplesOutput/petstore-simple.json b/src/vitis/vas/doc/vendor/zircote/swagger-php/tests/ExamplesOutput/petstore-simple.json
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/tests/ExamplesOutput/petstore-simple.json
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/tests/ExamplesOutput/petstore-simple.json
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/tests/ExamplesOutput/petstore-with-external-docs.json b/src/vitis/vas/doc/vendor/zircote/swagger-php/tests/ExamplesOutput/petstore-with-external-docs.json
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/tests/ExamplesOutput/petstore-with-external-docs.json
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/tests/ExamplesOutput/petstore-with-external-docs.json
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/tests/ExamplesOutput/petstore.json b/src/vitis/vas/doc/vendor/zircote/swagger-php/tests/ExamplesOutput/petstore.json
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/tests/ExamplesOutput/petstore.json
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/tests/ExamplesOutput/petstore.json
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/tests/ExamplesOutput/petstore.swagger.io.json b/src/vitis/vas/doc/vendor/zircote/swagger-php/tests/ExamplesOutput/petstore.swagger.io.json
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/tests/ExamplesOutput/petstore.swagger.io.json
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/tests/ExamplesOutput/petstore.swagger.io.json
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/tests/ExamplesTest.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/tests/ExamplesTest.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/tests/ExamplesTest.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/tests/ExamplesTest.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/tests/Fixtures/Ancestor.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/tests/Fixtures/Ancestor.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/tests/Fixtures/Ancestor.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/tests/Fixtures/Ancestor.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/tests/Fixtures/AncestorWithoutDocBlocks.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/tests/Fixtures/AncestorWithoutDocBlocks.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/tests/Fixtures/AncestorWithoutDocBlocks.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/tests/Fixtures/AncestorWithoutDocBlocks.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/tests/Fixtures/Child.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/tests/Fixtures/Child.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/tests/Fixtures/Child.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/tests/Fixtures/Child.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/tests/Fixtures/ChildWithDocBlocks.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/tests/Fixtures/ChildWithDocBlocks.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/tests/Fixtures/ChildWithDocBlocks.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/tests/Fixtures/ChildWithDocBlocks.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/tests/Fixtures/Customer.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/tests/Fixtures/Customer.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/tests/Fixtures/Customer.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/tests/Fixtures/Customer.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/tests/Fixtures/GrandAncestor.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/tests/Fixtures/GrandAncestor.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/tests/Fixtures/GrandAncestor.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/tests/Fixtures/GrandAncestor.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/tests/Fixtures/HelloTrait.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/tests/Fixtures/HelloTrait.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/tests/Fixtures/HelloTrait.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/tests/Fixtures/HelloTrait.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/tests/Fixtures/NestedProperty.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/tests/Fixtures/NestedProperty.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/tests/Fixtures/NestedProperty.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/tests/Fixtures/NestedProperty.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/tests/Fixtures/ThirdPartyAnnotations.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/tests/Fixtures/ThirdPartyAnnotations.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/tests/Fixtures/ThirdPartyAnnotations.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/tests/Fixtures/ThirdPartyAnnotations.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/tests/Fixtures/UsingPhpDoc.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/tests/Fixtures/UsingPhpDoc.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/tests/Fixtures/UsingPhpDoc.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/tests/Fixtures/UsingPhpDoc.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/tests/Fixtures/UsingRefs.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/tests/Fixtures/UsingRefs.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/tests/Fixtures/UsingRefs.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/tests/Fixtures/UsingRefs.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/tests/Fixtures/routes.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/tests/Fixtures/routes.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/tests/Fixtures/routes.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/tests/Fixtures/routes.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/tests/InheritPropertiesTest.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/tests/InheritPropertiesTest.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/tests/InheritPropertiesTest.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/tests/InheritPropertiesTest.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/tests/ItemsTest.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/tests/ItemsTest.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/tests/ItemsTest.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/tests/ItemsTest.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/tests/MergeIntoSwaggerTest.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/tests/MergeIntoSwaggerTest.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/tests/MergeIntoSwaggerTest.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/tests/MergeIntoSwaggerTest.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/tests/NestedPropertyTest.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/tests/NestedPropertyTest.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/tests/NestedPropertyTest.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/tests/NestedPropertyTest.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/tests/ResponseTest.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/tests/ResponseTest.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/tests/ResponseTest.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/tests/ResponseTest.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/tests/SerializerTest.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/tests/SerializerTest.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/tests/SerializerTest.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/tests/SerializerTest.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/tests/StaticAnalyserTest.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/tests/StaticAnalyserTest.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/tests/StaticAnalyserTest.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/tests/StaticAnalyserTest.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/tests/SwaggerTestCase.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/tests/SwaggerTestCase.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/tests/SwaggerTestCase.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/tests/SwaggerTestCase.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/tests/UtilTest.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/tests/UtilTest.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/tests/UtilTest.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/tests/UtilTest.php
diff --git a/vmap/vas/doc/vendor/zircote/swagger-php/tests/ValidateRelationsTest.php b/src/vitis/vas/doc/vendor/zircote/swagger-php/tests/ValidateRelationsTest.php
similarity index 100%
rename from vmap/vas/doc/vendor/zircote/swagger-php/tests/ValidateRelationsTest.php
rename to src/vitis/vas/doc/vendor/zircote/swagger-php/tests/ValidateRelationsTest.php
diff --git a/vmap/vas/public/studio/default.js b/src/vitis/vas/public/studio/default.js
similarity index 100%
rename from vmap/vas/public/studio/default.js
rename to src/vitis/vas/public/studio/default.js
diff --git a/vmap/vas/rest/.htaccess b/src/vitis/vas/rest/.htaccess
similarity index 100%
rename from vmap/vas/rest/.htaccess
rename to src/vitis/vas/rest/.htaccess
diff --git a/vmap/vas/rest/class/.htaccess b/src/vitis/vas/rest/class/.htaccess
similarity index 100%
rename from vmap/vas/rest/class/.htaccess
rename to src/vitis/vas/rest/class/.htaccess
diff --git a/vmap/vas/rest/class/Ldap.class.inc b/src/vitis/vas/rest/class/Ldap.class.inc
similarity index 100%
rename from vmap/vas/rest/class/Ldap.class.inc
rename to src/vitis/vas/rest/class/Ldap.class.inc
diff --git a/vmap/vas/rest/class/PEAR/Autoloader.php b/src/vitis/vas/rest/class/PEAR/Autoloader.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Autoloader.php
rename to src/vitis/vas/rest/class/PEAR/Autoloader.php
diff --git a/vmap/vas/rest/class/PEAR/Builder.php b/src/vitis/vas/rest/class/PEAR/Builder.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Builder.php
rename to src/vitis/vas/rest/class/PEAR/Builder.php
diff --git a/vmap/vas/rest/class/PEAR/ChannelFile.php b/src/vitis/vas/rest/class/PEAR/ChannelFile.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/ChannelFile.php
rename to src/vitis/vas/rest/class/PEAR/ChannelFile.php
diff --git a/vmap/vas/rest/class/PEAR/ChannelFile/Parser.php b/src/vitis/vas/rest/class/PEAR/ChannelFile/Parser.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/ChannelFile/Parser.php
rename to src/vitis/vas/rest/class/PEAR/ChannelFile/Parser.php
diff --git a/vmap/vas/rest/class/PEAR/Command.php b/src/vitis/vas/rest/class/PEAR/Command.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Command.php
rename to src/vitis/vas/rest/class/PEAR/Command.php
diff --git a/vmap/vas/rest/class/PEAR/Command/Auth.php b/src/vitis/vas/rest/class/PEAR/Command/Auth.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Command/Auth.php
rename to src/vitis/vas/rest/class/PEAR/Command/Auth.php
diff --git a/vmap/vas/rest/class/PEAR/Command/Auth.xml b/src/vitis/vas/rest/class/PEAR/Command/Auth.xml
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Command/Auth.xml
rename to src/vitis/vas/rest/class/PEAR/Command/Auth.xml
diff --git a/vmap/vas/rest/class/PEAR/Command/Build.php b/src/vitis/vas/rest/class/PEAR/Command/Build.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Command/Build.php
rename to src/vitis/vas/rest/class/PEAR/Command/Build.php
diff --git a/vmap/vas/rest/class/PEAR/Command/Build.xml b/src/vitis/vas/rest/class/PEAR/Command/Build.xml
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Command/Build.xml
rename to src/vitis/vas/rest/class/PEAR/Command/Build.xml
diff --git a/vmap/vas/rest/class/PEAR/Command/Channels.php b/src/vitis/vas/rest/class/PEAR/Command/Channels.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Command/Channels.php
rename to src/vitis/vas/rest/class/PEAR/Command/Channels.php
diff --git a/vmap/vas/rest/class/PEAR/Command/Channels.xml b/src/vitis/vas/rest/class/PEAR/Command/Channels.xml
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Command/Channels.xml
rename to src/vitis/vas/rest/class/PEAR/Command/Channels.xml
diff --git a/vmap/vas/rest/class/PEAR/Command/Common.php b/src/vitis/vas/rest/class/PEAR/Command/Common.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Command/Common.php
rename to src/vitis/vas/rest/class/PEAR/Command/Common.php
diff --git a/vmap/vas/rest/class/PEAR/Command/Config.php b/src/vitis/vas/rest/class/PEAR/Command/Config.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Command/Config.php
rename to src/vitis/vas/rest/class/PEAR/Command/Config.php
diff --git a/vmap/vas/rest/class/PEAR/Command/Config.xml b/src/vitis/vas/rest/class/PEAR/Command/Config.xml
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Command/Config.xml
rename to src/vitis/vas/rest/class/PEAR/Command/Config.xml
diff --git a/vmap/vas/rest/class/PEAR/Command/Install.php b/src/vitis/vas/rest/class/PEAR/Command/Install.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Command/Install.php
rename to src/vitis/vas/rest/class/PEAR/Command/Install.php
diff --git a/vmap/vas/rest/class/PEAR/Command/Install.xml b/src/vitis/vas/rest/class/PEAR/Command/Install.xml
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Command/Install.xml
rename to src/vitis/vas/rest/class/PEAR/Command/Install.xml
diff --git a/vmap/vas/rest/class/PEAR/Command/Mirror.php b/src/vitis/vas/rest/class/PEAR/Command/Mirror.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Command/Mirror.php
rename to src/vitis/vas/rest/class/PEAR/Command/Mirror.php
diff --git a/vmap/vas/rest/class/PEAR/Command/Mirror.xml b/src/vitis/vas/rest/class/PEAR/Command/Mirror.xml
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Command/Mirror.xml
rename to src/vitis/vas/rest/class/PEAR/Command/Mirror.xml
diff --git a/vmap/vas/rest/class/PEAR/Command/Package.php b/src/vitis/vas/rest/class/PEAR/Command/Package.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Command/Package.php
rename to src/vitis/vas/rest/class/PEAR/Command/Package.php
diff --git a/vmap/vas/rest/class/PEAR/Command/Package.xml b/src/vitis/vas/rest/class/PEAR/Command/Package.xml
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Command/Package.xml
rename to src/vitis/vas/rest/class/PEAR/Command/Package.xml
diff --git a/vmap/vas/rest/class/PEAR/Command/Pickle.php b/src/vitis/vas/rest/class/PEAR/Command/Pickle.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Command/Pickle.php
rename to src/vitis/vas/rest/class/PEAR/Command/Pickle.php
diff --git a/vmap/vas/rest/class/PEAR/Command/Pickle.xml b/src/vitis/vas/rest/class/PEAR/Command/Pickle.xml
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Command/Pickle.xml
rename to src/vitis/vas/rest/class/PEAR/Command/Pickle.xml
diff --git a/vmap/vas/rest/class/PEAR/Command/Registry.php b/src/vitis/vas/rest/class/PEAR/Command/Registry.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Command/Registry.php
rename to src/vitis/vas/rest/class/PEAR/Command/Registry.php
diff --git a/vmap/vas/rest/class/PEAR/Command/Registry.xml b/src/vitis/vas/rest/class/PEAR/Command/Registry.xml
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Command/Registry.xml
rename to src/vitis/vas/rest/class/PEAR/Command/Registry.xml
diff --git a/vmap/vas/rest/class/PEAR/Command/Remote.php b/src/vitis/vas/rest/class/PEAR/Command/Remote.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Command/Remote.php
rename to src/vitis/vas/rest/class/PEAR/Command/Remote.php
diff --git a/vmap/vas/rest/class/PEAR/Command/Remote.xml b/src/vitis/vas/rest/class/PEAR/Command/Remote.xml
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Command/Remote.xml
rename to src/vitis/vas/rest/class/PEAR/Command/Remote.xml
diff --git a/vmap/vas/rest/class/PEAR/Command/Test.php b/src/vitis/vas/rest/class/PEAR/Command/Test.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Command/Test.php
rename to src/vitis/vas/rest/class/PEAR/Command/Test.php
diff --git a/vmap/vas/rest/class/PEAR/Command/Test.xml b/src/vitis/vas/rest/class/PEAR/Command/Test.xml
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Command/Test.xml
rename to src/vitis/vas/rest/class/PEAR/Command/Test.xml
diff --git a/vmap/vas/rest/class/PEAR/Common.php b/src/vitis/vas/rest/class/PEAR/Common.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Common.php
rename to src/vitis/vas/rest/class/PEAR/Common.php
diff --git a/vmap/vas/rest/class/PEAR/Config.php b/src/vitis/vas/rest/class/PEAR/Config.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Config.php
rename to src/vitis/vas/rest/class/PEAR/Config.php
diff --git a/vmap/vas/rest/class/PEAR/Dependency.php b/src/vitis/vas/rest/class/PEAR/Dependency.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Dependency.php
rename to src/vitis/vas/rest/class/PEAR/Dependency.php
diff --git a/vmap/vas/rest/class/PEAR/Dependency2.php b/src/vitis/vas/rest/class/PEAR/Dependency2.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Dependency2.php
rename to src/vitis/vas/rest/class/PEAR/Dependency2.php
diff --git a/vmap/vas/rest/class/PEAR/DependencyDB.php b/src/vitis/vas/rest/class/PEAR/DependencyDB.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/DependencyDB.php
rename to src/vitis/vas/rest/class/PEAR/DependencyDB.php
diff --git a/vmap/vas/rest/class/PEAR/Downloader.php b/src/vitis/vas/rest/class/PEAR/Downloader.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Downloader.php
rename to src/vitis/vas/rest/class/PEAR/Downloader.php
diff --git a/vmap/vas/rest/class/PEAR/Downloader/Package.php b/src/vitis/vas/rest/class/PEAR/Downloader/Package.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Downloader/Package.php
rename to src/vitis/vas/rest/class/PEAR/Downloader/Package.php
diff --git a/vmap/vas/rest/class/PEAR/ErrorStack.php b/src/vitis/vas/rest/class/PEAR/ErrorStack.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/ErrorStack.php
rename to src/vitis/vas/rest/class/PEAR/ErrorStack.php
diff --git a/vmap/vas/rest/class/PEAR/Exception.php b/src/vitis/vas/rest/class/PEAR/Exception.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Exception.php
rename to src/vitis/vas/rest/class/PEAR/Exception.php
diff --git a/vmap/vas/rest/class/PEAR/FixPHP5PEARWarnings.php b/src/vitis/vas/rest/class/PEAR/FixPHP5PEARWarnings.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/FixPHP5PEARWarnings.php
rename to src/vitis/vas/rest/class/PEAR/FixPHP5PEARWarnings.php
diff --git a/vmap/vas/rest/class/PEAR/Frontend.php b/src/vitis/vas/rest/class/PEAR/Frontend.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Frontend.php
rename to src/vitis/vas/rest/class/PEAR/Frontend.php
diff --git a/vmap/vas/rest/class/PEAR/Frontend/CLI.php b/src/vitis/vas/rest/class/PEAR/Frontend/CLI.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Frontend/CLI.php
rename to src/vitis/vas/rest/class/PEAR/Frontend/CLI.php
diff --git a/vmap/vas/rest/class/PEAR/Installer.php b/src/vitis/vas/rest/class/PEAR/Installer.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Installer.php
rename to src/vitis/vas/rest/class/PEAR/Installer.php
diff --git a/vmap/vas/rest/class/PEAR/Installer/Role.php b/src/vitis/vas/rest/class/PEAR/Installer/Role.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Installer/Role.php
rename to src/vitis/vas/rest/class/PEAR/Installer/Role.php
diff --git a/vmap/vas/rest/class/PEAR/Installer/Role/Cfg.php b/src/vitis/vas/rest/class/PEAR/Installer/Role/Cfg.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Installer/Role/Cfg.php
rename to src/vitis/vas/rest/class/PEAR/Installer/Role/Cfg.php
diff --git a/vmap/vas/rest/class/PEAR/Installer/Role/Cfg.xml b/src/vitis/vas/rest/class/PEAR/Installer/Role/Cfg.xml
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Installer/Role/Cfg.xml
rename to src/vitis/vas/rest/class/PEAR/Installer/Role/Cfg.xml
diff --git a/vmap/vas/rest/class/PEAR/Installer/Role/Common.php b/src/vitis/vas/rest/class/PEAR/Installer/Role/Common.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Installer/Role/Common.php
rename to src/vitis/vas/rest/class/PEAR/Installer/Role/Common.php
diff --git a/vmap/vas/rest/class/PEAR/Installer/Role/Data.php b/src/vitis/vas/rest/class/PEAR/Installer/Role/Data.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Installer/Role/Data.php
rename to src/vitis/vas/rest/class/PEAR/Installer/Role/Data.php
diff --git a/vmap/vas/rest/class/PEAR/Installer/Role/Data.xml b/src/vitis/vas/rest/class/PEAR/Installer/Role/Data.xml
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Installer/Role/Data.xml
rename to src/vitis/vas/rest/class/PEAR/Installer/Role/Data.xml
diff --git a/vmap/vas/rest/class/PEAR/Installer/Role/Doc.php b/src/vitis/vas/rest/class/PEAR/Installer/Role/Doc.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Installer/Role/Doc.php
rename to src/vitis/vas/rest/class/PEAR/Installer/Role/Doc.php
diff --git a/vmap/vas/rest/class/PEAR/Installer/Role/Doc.xml b/src/vitis/vas/rest/class/PEAR/Installer/Role/Doc.xml
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Installer/Role/Doc.xml
rename to src/vitis/vas/rest/class/PEAR/Installer/Role/Doc.xml
diff --git a/vmap/vas/rest/class/PEAR/Installer/Role/Ext.php b/src/vitis/vas/rest/class/PEAR/Installer/Role/Ext.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Installer/Role/Ext.php
rename to src/vitis/vas/rest/class/PEAR/Installer/Role/Ext.php
diff --git a/vmap/vas/rest/class/PEAR/Installer/Role/Ext.xml b/src/vitis/vas/rest/class/PEAR/Installer/Role/Ext.xml
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Installer/Role/Ext.xml
rename to src/vitis/vas/rest/class/PEAR/Installer/Role/Ext.xml
diff --git a/vmap/vas/rest/class/PEAR/Installer/Role/Php.php b/src/vitis/vas/rest/class/PEAR/Installer/Role/Php.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Installer/Role/Php.php
rename to src/vitis/vas/rest/class/PEAR/Installer/Role/Php.php
diff --git a/vmap/vas/rest/class/PEAR/Installer/Role/Php.xml b/src/vitis/vas/rest/class/PEAR/Installer/Role/Php.xml
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Installer/Role/Php.xml
rename to src/vitis/vas/rest/class/PEAR/Installer/Role/Php.xml
diff --git a/vmap/vas/rest/class/PEAR/Installer/Role/Script.php b/src/vitis/vas/rest/class/PEAR/Installer/Role/Script.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Installer/Role/Script.php
rename to src/vitis/vas/rest/class/PEAR/Installer/Role/Script.php
diff --git a/vmap/vas/rest/class/PEAR/Installer/Role/Script.xml b/src/vitis/vas/rest/class/PEAR/Installer/Role/Script.xml
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Installer/Role/Script.xml
rename to src/vitis/vas/rest/class/PEAR/Installer/Role/Script.xml
diff --git a/vmap/vas/rest/class/PEAR/Installer/Role/Src.php b/src/vitis/vas/rest/class/PEAR/Installer/Role/Src.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Installer/Role/Src.php
rename to src/vitis/vas/rest/class/PEAR/Installer/Role/Src.php
diff --git a/vmap/vas/rest/class/PEAR/Installer/Role/Src.xml b/src/vitis/vas/rest/class/PEAR/Installer/Role/Src.xml
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Installer/Role/Src.xml
rename to src/vitis/vas/rest/class/PEAR/Installer/Role/Src.xml
diff --git a/vmap/vas/rest/class/PEAR/Installer/Role/Test.php b/src/vitis/vas/rest/class/PEAR/Installer/Role/Test.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Installer/Role/Test.php
rename to src/vitis/vas/rest/class/PEAR/Installer/Role/Test.php
diff --git a/vmap/vas/rest/class/PEAR/Installer/Role/Test.xml b/src/vitis/vas/rest/class/PEAR/Installer/Role/Test.xml
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Installer/Role/Test.xml
rename to src/vitis/vas/rest/class/PEAR/Installer/Role/Test.xml
diff --git a/vmap/vas/rest/class/PEAR/Installer/Role/Www.php b/src/vitis/vas/rest/class/PEAR/Installer/Role/Www.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Installer/Role/Www.php
rename to src/vitis/vas/rest/class/PEAR/Installer/Role/Www.php
diff --git a/vmap/vas/rest/class/PEAR/Installer/Role/Www.xml b/src/vitis/vas/rest/class/PEAR/Installer/Role/Www.xml
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Installer/Role/Www.xml
rename to src/vitis/vas/rest/class/PEAR/Installer/Role/Www.xml
diff --git a/vmap/vas/rest/class/PEAR/Mail.php b/src/vitis/vas/rest/class/PEAR/Mail.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Mail.php
rename to src/vitis/vas/rest/class/PEAR/Mail.php
diff --git a/vmap/vas/rest/class/PEAR/Mail/RFC822.php b/src/vitis/vas/rest/class/PEAR/Mail/RFC822.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Mail/RFC822.php
rename to src/vitis/vas/rest/class/PEAR/Mail/RFC822.php
diff --git a/vmap/vas/rest/class/PEAR/Mail/mail.php b/src/vitis/vas/rest/class/PEAR/Mail/mail.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Mail/mail.php
rename to src/vitis/vas/rest/class/PEAR/Mail/mail.php
diff --git a/vmap/vas/rest/class/PEAR/Mail/mime.php b/src/vitis/vas/rest/class/PEAR/Mail/mime.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Mail/mime.php
rename to src/vitis/vas/rest/class/PEAR/Mail/mime.php
diff --git a/vmap/vas/rest/class/PEAR/Mail/mimePart.php b/src/vitis/vas/rest/class/PEAR/Mail/mimePart.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Mail/mimePart.php
rename to src/vitis/vas/rest/class/PEAR/Mail/mimePart.php
diff --git a/vmap/vas/rest/class/PEAR/Mail/mock.php b/src/vitis/vas/rest/class/PEAR/Mail/mock.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Mail/mock.php
rename to src/vitis/vas/rest/class/PEAR/Mail/mock.php
diff --git a/vmap/vas/rest/class/PEAR/Mail/net/SMTP.php b/src/vitis/vas/rest/class/PEAR/Mail/net/SMTP.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Mail/net/SMTP.php
rename to src/vitis/vas/rest/class/PEAR/Mail/net/SMTP.php
diff --git a/vmap/vas/rest/class/PEAR/Mail/net/Socket.php b/src/vitis/vas/rest/class/PEAR/Mail/net/Socket.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Mail/net/Socket.php
rename to src/vitis/vas/rest/class/PEAR/Mail/net/Socket.php
diff --git a/vmap/vas/rest/class/PEAR/Mail/net/docs/guide.txt b/src/vitis/vas/rest/class/PEAR/Mail/net/docs/guide.txt
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Mail/net/docs/guide.txt
rename to src/vitis/vas/rest/class/PEAR/Mail/net/docs/guide.txt
diff --git a/vmap/vas/rest/class/PEAR/Mail/net/examples/basic.php b/src/vitis/vas/rest/class/PEAR/Mail/net/examples/basic.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Mail/net/examples/basic.php
rename to src/vitis/vas/rest/class/PEAR/Mail/net/examples/basic.php
diff --git a/vmap/vas/rest/class/PEAR/Mail/net/tests/auth.phpt b/src/vitis/vas/rest/class/PEAR/Mail/net/tests/auth.phpt
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Mail/net/tests/auth.phpt
rename to src/vitis/vas/rest/class/PEAR/Mail/net/tests/auth.phpt
diff --git a/vmap/vas/rest/class/PEAR/Mail/net/tests/basic.phpt b/src/vitis/vas/rest/class/PEAR/Mail/net/tests/basic.phpt
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Mail/net/tests/basic.phpt
rename to src/vitis/vas/rest/class/PEAR/Mail/net/tests/basic.phpt
diff --git a/vmap/vas/rest/class/PEAR/Mail/net/tests/config.php.dist b/src/vitis/vas/rest/class/PEAR/Mail/net/tests/config.php.dist
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Mail/net/tests/config.php.dist
rename to src/vitis/vas/rest/class/PEAR/Mail/net/tests/config.php.dist
diff --git a/vmap/vas/rest/class/PEAR/Mail/net/tests/quotedata.phpt b/src/vitis/vas/rest/class/PEAR/Mail/net/tests/quotedata.phpt
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Mail/net/tests/quotedata.phpt
rename to src/vitis/vas/rest/class/PEAR/Mail/net/tests/quotedata.phpt
diff --git a/vmap/vas/rest/class/PEAR/Mail/null.php b/src/vitis/vas/rest/class/PEAR/Mail/null.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Mail/null.php
rename to src/vitis/vas/rest/class/PEAR/Mail/null.php
diff --git a/vmap/vas/rest/class/PEAR/Mail/sendmail.php b/src/vitis/vas/rest/class/PEAR/Mail/sendmail.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Mail/sendmail.php
rename to src/vitis/vas/rest/class/PEAR/Mail/sendmail.php
diff --git a/vmap/vas/rest/class/PEAR/Mail/smtp.php b/src/vitis/vas/rest/class/PEAR/Mail/smtp.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Mail/smtp.php
rename to src/vitis/vas/rest/class/PEAR/Mail/smtp.php
diff --git a/vmap/vas/rest/class/PEAR/Mail/smtpmx.php b/src/vitis/vas/rest/class/PEAR/Mail/smtpmx.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Mail/smtpmx.php
rename to src/vitis/vas/rest/class/PEAR/Mail/smtpmx.php
diff --git a/vmap/vas/rest/class/PEAR/PEAR.php b/src/vitis/vas/rest/class/PEAR/PEAR.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/PEAR.php
rename to src/vitis/vas/rest/class/PEAR/PEAR.php
diff --git a/vmap/vas/rest/class/PEAR/PackageFile.php b/src/vitis/vas/rest/class/PEAR/PackageFile.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/PackageFile.php
rename to src/vitis/vas/rest/class/PEAR/PackageFile.php
diff --git a/vmap/vas/rest/class/PEAR/PackageFile/Generator/v1.php b/src/vitis/vas/rest/class/PEAR/PackageFile/Generator/v1.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/PackageFile/Generator/v1.php
rename to src/vitis/vas/rest/class/PEAR/PackageFile/Generator/v1.php
diff --git a/vmap/vas/rest/class/PEAR/PackageFile/Generator/v2.php b/src/vitis/vas/rest/class/PEAR/PackageFile/Generator/v2.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/PackageFile/Generator/v2.php
rename to src/vitis/vas/rest/class/PEAR/PackageFile/Generator/v2.php
diff --git a/vmap/vas/rest/class/PEAR/PackageFile/Parser/v1.php b/src/vitis/vas/rest/class/PEAR/PackageFile/Parser/v1.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/PackageFile/Parser/v1.php
rename to src/vitis/vas/rest/class/PEAR/PackageFile/Parser/v1.php
diff --git a/vmap/vas/rest/class/PEAR/PackageFile/Parser/v2.php b/src/vitis/vas/rest/class/PEAR/PackageFile/Parser/v2.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/PackageFile/Parser/v2.php
rename to src/vitis/vas/rest/class/PEAR/PackageFile/Parser/v2.php
diff --git a/vmap/vas/rest/class/PEAR/PackageFile/v1.php b/src/vitis/vas/rest/class/PEAR/PackageFile/v1.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/PackageFile/v1.php
rename to src/vitis/vas/rest/class/PEAR/PackageFile/v1.php
diff --git a/vmap/vas/rest/class/PEAR/PackageFile/v2.php b/src/vitis/vas/rest/class/PEAR/PackageFile/v2.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/PackageFile/v2.php
rename to src/vitis/vas/rest/class/PEAR/PackageFile/v2.php
diff --git a/vmap/vas/rest/class/PEAR/PackageFile/v2/Validator.php b/src/vitis/vas/rest/class/PEAR/PackageFile/v2/Validator.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/PackageFile/v2/Validator.php
rename to src/vitis/vas/rest/class/PEAR/PackageFile/v2/Validator.php
diff --git a/vmap/vas/rest/class/PEAR/PackageFile/v2/rw.php b/src/vitis/vas/rest/class/PEAR/PackageFile/v2/rw.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/PackageFile/v2/rw.php
rename to src/vitis/vas/rest/class/PEAR/PackageFile/v2/rw.php
diff --git a/vmap/vas/rest/class/PEAR/Packager.php b/src/vitis/vas/rest/class/PEAR/Packager.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Packager.php
rename to src/vitis/vas/rest/class/PEAR/Packager.php
diff --git a/vmap/vas/rest/class/PEAR/REST.php b/src/vitis/vas/rest/class/PEAR/REST.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/REST.php
rename to src/vitis/vas/rest/class/PEAR/REST.php
diff --git a/vmap/vas/rest/class/PEAR/REST/10.php b/src/vitis/vas/rest/class/PEAR/REST/10.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/REST/10.php
rename to src/vitis/vas/rest/class/PEAR/REST/10.php
diff --git a/vmap/vas/rest/class/PEAR/REST/11.php b/src/vitis/vas/rest/class/PEAR/REST/11.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/REST/11.php
rename to src/vitis/vas/rest/class/PEAR/REST/11.php
diff --git a/vmap/vas/rest/class/PEAR/REST/13.php b/src/vitis/vas/rest/class/PEAR/REST/13.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/REST/13.php
rename to src/vitis/vas/rest/class/PEAR/REST/13.php
diff --git a/vmap/vas/rest/class/PEAR/Registry.php b/src/vitis/vas/rest/class/PEAR/Registry.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Registry.php
rename to src/vitis/vas/rest/class/PEAR/Registry.php
diff --git a/vmap/vas/rest/class/PEAR/Remote.php b/src/vitis/vas/rest/class/PEAR/Remote.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Remote.php
rename to src/vitis/vas/rest/class/PEAR/Remote.php
diff --git a/vmap/vas/rest/class/PEAR/RunTest.php b/src/vitis/vas/rest/class/PEAR/RunTest.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/RunTest.php
rename to src/vitis/vas/rest/class/PEAR/RunTest.php
diff --git a/vmap/vas/rest/class/PEAR/Task/Common.php b/src/vitis/vas/rest/class/PEAR/Task/Common.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Task/Common.php
rename to src/vitis/vas/rest/class/PEAR/Task/Common.php
diff --git a/vmap/vas/rest/class/PEAR/Task/Postinstallscript.php b/src/vitis/vas/rest/class/PEAR/Task/Postinstallscript.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Task/Postinstallscript.php
rename to src/vitis/vas/rest/class/PEAR/Task/Postinstallscript.php
diff --git a/vmap/vas/rest/class/PEAR/Task/Postinstallscript/rw.php b/src/vitis/vas/rest/class/PEAR/Task/Postinstallscript/rw.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Task/Postinstallscript/rw.php
rename to src/vitis/vas/rest/class/PEAR/Task/Postinstallscript/rw.php
diff --git a/vmap/vas/rest/class/PEAR/Task/Replace.php b/src/vitis/vas/rest/class/PEAR/Task/Replace.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Task/Replace.php
rename to src/vitis/vas/rest/class/PEAR/Task/Replace.php
diff --git a/vmap/vas/rest/class/PEAR/Task/Replace/rw.php b/src/vitis/vas/rest/class/PEAR/Task/Replace/rw.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Task/Replace/rw.php
rename to src/vitis/vas/rest/class/PEAR/Task/Replace/rw.php
diff --git a/vmap/vas/rest/class/PEAR/Task/Unixeol.php b/src/vitis/vas/rest/class/PEAR/Task/Unixeol.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Task/Unixeol.php
rename to src/vitis/vas/rest/class/PEAR/Task/Unixeol.php
diff --git a/vmap/vas/rest/class/PEAR/Task/Unixeol/rw.php b/src/vitis/vas/rest/class/PEAR/Task/Unixeol/rw.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Task/Unixeol/rw.php
rename to src/vitis/vas/rest/class/PEAR/Task/Unixeol/rw.php
diff --git a/vmap/vas/rest/class/PEAR/Task/Windowseol.php b/src/vitis/vas/rest/class/PEAR/Task/Windowseol.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Task/Windowseol.php
rename to src/vitis/vas/rest/class/PEAR/Task/Windowseol.php
diff --git a/vmap/vas/rest/class/PEAR/Task/Windowseol/rw.php b/src/vitis/vas/rest/class/PEAR/Task/Windowseol/rw.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Task/Windowseol/rw.php
rename to src/vitis/vas/rest/class/PEAR/Task/Windowseol/rw.php
diff --git a/vmap/vas/rest/class/PEAR/Validate.php b/src/vitis/vas/rest/class/PEAR/Validate.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Validate.php
rename to src/vitis/vas/rest/class/PEAR/Validate.php
diff --git a/vmap/vas/rest/class/PEAR/Validator/PECL.php b/src/vitis/vas/rest/class/PEAR/Validator/PECL.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/Validator/PECL.php
rename to src/vitis/vas/rest/class/PEAR/Validator/PECL.php
diff --git a/vmap/vas/rest/class/PEAR/XMLParser.php b/src/vitis/vas/rest/class/PEAR/XMLParser.php
similarity index 100%
rename from vmap/vas/rest/class/PEAR/XMLParser.php
rename to src/vitis/vas/rest/class/PEAR/XMLParser.php
diff --git a/vmap/vas/rest/class/PHPMailer/extras/EasyPeasyICS.php b/src/vitis/vas/rest/class/PHPMailer/extras/EasyPeasyICS.php
similarity index 100%
rename from vmap/vas/rest/class/PHPMailer/extras/EasyPeasyICS.php
rename to src/vitis/vas/rest/class/PHPMailer/extras/EasyPeasyICS.php
diff --git a/vmap/vas/rest/class/PHPMailer/extras/README.md b/src/vitis/vas/rest/class/PHPMailer/extras/README.md
similarity index 100%
rename from vmap/vas/rest/class/PHPMailer/extras/README.md
rename to src/vitis/vas/rest/class/PHPMailer/extras/README.md
diff --git a/vmap/vas/rest/class/PHPMailer/extras/htmlfilter.php b/src/vitis/vas/rest/class/PHPMailer/extras/htmlfilter.php
similarity index 100%
rename from vmap/vas/rest/class/PHPMailer/extras/htmlfilter.php
rename to src/vitis/vas/rest/class/PHPMailer/extras/htmlfilter.php
diff --git a/vmap/vas/rest/class/PHPMailer/extras/ntlm_sasl_client.php b/src/vitis/vas/rest/class/PHPMailer/extras/ntlm_sasl_client.php
similarity index 100%
rename from vmap/vas/rest/class/PHPMailer/extras/ntlm_sasl_client.php
rename to src/vitis/vas/rest/class/PHPMailer/extras/ntlm_sasl_client.php
diff --git a/vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-am.php b/src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-am.php
similarity index 100%
rename from vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-am.php
rename to src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-am.php
diff --git a/vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-ar.php b/src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-ar.php
similarity index 100%
rename from vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-ar.php
rename to src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-ar.php
diff --git a/vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-az.php b/src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-az.php
similarity index 100%
rename from vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-az.php
rename to src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-az.php
diff --git a/vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-ba.php b/src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-ba.php
similarity index 100%
rename from vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-ba.php
rename to src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-ba.php
diff --git a/vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-be.php b/src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-be.php
similarity index 100%
rename from vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-be.php
rename to src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-be.php
diff --git a/vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-bg.php b/src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-bg.php
similarity index 100%
rename from vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-bg.php
rename to src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-bg.php
diff --git a/vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-ca.php b/src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-ca.php
similarity index 100%
rename from vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-ca.php
rename to src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-ca.php
diff --git a/vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-ch.php b/src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-ch.php
similarity index 100%
rename from vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-ch.php
rename to src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-ch.php
diff --git a/vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-cs.php b/src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-cs.php
similarity index 100%
rename from vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-cs.php
rename to src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-cs.php
diff --git a/vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-da.php b/src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-da.php
similarity index 100%
rename from vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-da.php
rename to src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-da.php
diff --git a/vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-de.php b/src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-de.php
similarity index 100%
rename from vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-de.php
rename to src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-de.php
diff --git a/vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-el.php b/src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-el.php
similarity index 100%
rename from vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-el.php
rename to src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-el.php
diff --git a/vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-eo.php b/src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-eo.php
similarity index 100%
rename from vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-eo.php
rename to src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-eo.php
diff --git a/vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-es.php b/src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-es.php
similarity index 100%
rename from vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-es.php
rename to src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-es.php
diff --git a/vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-et.php b/src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-et.php
similarity index 100%
rename from vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-et.php
rename to src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-et.php
diff --git a/vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-fa.php b/src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-fa.php
similarity index 100%
rename from vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-fa.php
rename to src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-fa.php
diff --git a/vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-fi.php b/src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-fi.php
similarity index 100%
rename from vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-fi.php
rename to src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-fi.php
diff --git a/vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-fo.php b/src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-fo.php
similarity index 100%
rename from vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-fo.php
rename to src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-fo.php
diff --git a/vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-fr.php b/src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-fr.php
similarity index 100%
rename from vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-fr.php
rename to src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-fr.php
diff --git a/vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-gl.php b/src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-gl.php
similarity index 100%
rename from vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-gl.php
rename to src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-gl.php
diff --git a/vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-he.php b/src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-he.php
similarity index 100%
rename from vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-he.php
rename to src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-he.php
diff --git a/vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-hi.php b/src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-hi.php
similarity index 100%
rename from vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-hi.php
rename to src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-hi.php
diff --git a/vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-hr.php b/src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-hr.php
similarity index 100%
rename from vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-hr.php
rename to src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-hr.php
diff --git a/vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-hu.php b/src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-hu.php
similarity index 100%
rename from vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-hu.php
rename to src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-hu.php
diff --git a/vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-id.php b/src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-id.php
similarity index 100%
rename from vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-id.php
rename to src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-id.php
diff --git a/vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-it.php b/src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-it.php
similarity index 100%
rename from vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-it.php
rename to src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-it.php
diff --git a/vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-ja.php b/src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-ja.php
similarity index 100%
rename from vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-ja.php
rename to src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-ja.php
diff --git a/vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-ka.php b/src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-ka.php
similarity index 100%
rename from vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-ka.php
rename to src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-ka.php
diff --git a/vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-ko.php b/src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-ko.php
similarity index 100%
rename from vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-ko.php
rename to src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-ko.php
diff --git a/vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-lt.php b/src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-lt.php
similarity index 100%
rename from vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-lt.php
rename to src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-lt.php
diff --git a/vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-lv.php b/src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-lv.php
similarity index 100%
rename from vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-lv.php
rename to src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-lv.php
diff --git a/vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-ms.php b/src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-ms.php
similarity index 100%
rename from vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-ms.php
rename to src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-ms.php
diff --git a/vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-nb.php b/src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-nb.php
similarity index 100%
rename from vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-nb.php
rename to src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-nb.php
diff --git a/vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-nl.php b/src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-nl.php
similarity index 100%
rename from vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-nl.php
rename to src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-nl.php
diff --git a/vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-pl.php b/src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-pl.php
similarity index 100%
rename from vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-pl.php
rename to src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-pl.php
diff --git a/vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-pt.php b/src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-pt.php
similarity index 100%
rename from vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-pt.php
rename to src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-pt.php
diff --git a/vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-pt_br.php b/src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-pt_br.php
similarity index 100%
rename from vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-pt_br.php
rename to src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-pt_br.php
diff --git a/vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-ro.php b/src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-ro.php
similarity index 100%
rename from vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-ro.php
rename to src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-ro.php
diff --git a/vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-rs.php b/src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-rs.php
similarity index 100%
rename from vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-rs.php
rename to src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-rs.php
diff --git a/vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-ru.php b/src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-ru.php
similarity index 100%
rename from vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-ru.php
rename to src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-ru.php
diff --git a/vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-sk.php b/src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-sk.php
similarity index 100%
rename from vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-sk.php
rename to src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-sk.php
diff --git a/vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-sl.php b/src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-sl.php
similarity index 100%
rename from vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-sl.php
rename to src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-sl.php
diff --git a/vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-sr.php b/src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-sr.php
similarity index 100%
rename from vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-sr.php
rename to src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-sr.php
diff --git a/vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-sv.php b/src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-sv.php
similarity index 100%
rename from vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-sv.php
rename to src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-sv.php
diff --git a/vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-tr.php b/src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-tr.php
similarity index 100%
rename from vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-tr.php
rename to src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-tr.php
diff --git a/vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-uk.php b/src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-uk.php
similarity index 100%
rename from vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-uk.php
rename to src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-uk.php
diff --git a/vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-vi.php b/src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-vi.php
similarity index 100%
rename from vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-vi.php
rename to src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-vi.php
diff --git a/vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-zh.php b/src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-zh.php
similarity index 100%
rename from vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-zh.php
rename to src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-zh.php
diff --git a/vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-zh_cn.php b/src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-zh_cn.php
similarity index 100%
rename from vmap/vas/rest/class/PHPMailer/language/phpmailer.lang-zh_cn.php
rename to src/vitis/vas/rest/class/PHPMailer/language/phpmailer.lang-zh_cn.php
diff --git a/vmap/vas/rest/class/PHPMailer/src/Exception.php b/src/vitis/vas/rest/class/PHPMailer/src/Exception.php
similarity index 100%
rename from vmap/vas/rest/class/PHPMailer/src/Exception.php
rename to src/vitis/vas/rest/class/PHPMailer/src/Exception.php
diff --git a/vmap/vas/rest/class/PHPMailer/src/OAuth.php b/src/vitis/vas/rest/class/PHPMailer/src/OAuth.php
similarity index 100%
rename from vmap/vas/rest/class/PHPMailer/src/OAuth.php
rename to src/vitis/vas/rest/class/PHPMailer/src/OAuth.php
diff --git a/vmap/vas/rest/class/PHPMailer/src/PHPMailer.php b/src/vitis/vas/rest/class/PHPMailer/src/PHPMailer.php
similarity index 100%
rename from vmap/vas/rest/class/PHPMailer/src/PHPMailer.php
rename to src/vitis/vas/rest/class/PHPMailer/src/PHPMailer.php
diff --git a/vmap/vas/rest/class/PHPMailer/src/POP3.php b/src/vitis/vas/rest/class/PHPMailer/src/POP3.php
similarity index 100%
rename from vmap/vas/rest/class/PHPMailer/src/POP3.php
rename to src/vitis/vas/rest/class/PHPMailer/src/POP3.php
diff --git a/vmap/vas/rest/class/PHPMailer/src/SMTP.php b/src/vitis/vas/rest/class/PHPMailer/src/SMTP.php
similarity index 100%
rename from vmap/vas/rest/class/PHPMailer/src/SMTP.php
rename to src/vitis/vas/rest/class/PHPMailer/src/SMTP.php
diff --git a/vmap/vas/rest/class/aws_lib/AWS_Notification/AWS_SMS.class.inc b/src/vitis/vas/rest/class/aws_lib/AWS_Notification/AWS_SMS.class.inc
similarity index 100%
rename from vmap/vas/rest/class/aws_lib/AWS_Notification/AWS_SMS.class.inc
rename to src/vitis/vas/rest/class/aws_lib/AWS_Notification/AWS_SMS.class.inc
diff --git a/vmap/vas/rest/class/aws_lib/AWS_Notification/AWS_notification.class.inc b/src/vitis/vas/rest/class/aws_lib/AWS_Notification/AWS_notification.class.inc
similarity index 100%
rename from vmap/vas/rest/class/aws_lib/AWS_Notification/AWS_notification.class.inc
rename to src/vitis/vas/rest/class/aws_lib/AWS_Notification/AWS_notification.class.inc
diff --git a/vmap/vas/rest/class/aws_lib/AmazonAWS.class.inc b/src/vitis/vas/rest/class/aws_lib/AmazonAWS.class.inc
similarity index 100%
rename from vmap/vas/rest/class/aws_lib/AmazonAWS.class.inc
rename to src/vitis/vas/rest/class/aws_lib/AmazonAWS.class.inc
diff --git a/vmap/vas/rest/class/aws_lib/AmazonApiGateway.class.inc b/src/vitis/vas/rest/class/aws_lib/AmazonApiGateway.class.inc
similarity index 100%
rename from vmap/vas/rest/class/aws_lib/AmazonApiGateway.class.inc
rename to src/vitis/vas/rest/class/aws_lib/AmazonApiGateway.class.inc
diff --git a/vmap/vas/rest/class/aws_lib/AmazonS3.class.inc b/src/vitis/vas/rest/class/aws_lib/AmazonS3.class.inc
similarity index 100%
rename from vmap/vas/rest/class/aws_lib/AmazonS3.class.inc
rename to src/vitis/vas/rest/class/aws_lib/AmazonS3.class.inc
diff --git a/vmap/vas/rest/class/treeview/LdapTree.php b/src/vitis/vas/rest/class/treeview/LdapTree.php
similarity index 100%
rename from vmap/vas/rest/class/treeview/LdapTree.php
rename to src/vitis/vas/rest/class/treeview/LdapTree.php
diff --git a/vmap/vas/rest/class/treeview/Tree.php b/src/vitis/vas/rest/class/treeview/Tree.php
similarity index 100%
rename from vmap/vas/rest/class/treeview/Tree.php
rename to src/vitis/vas/rest/class/treeview/Tree.php
diff --git a/vmap/vas/rest/class/treeview/aciTree.php b/src/vitis/vas/rest/class/treeview/aciTree.php
similarity index 100%
rename from vmap/vas/rest/class/treeview/aciTree.php
rename to src/vitis/vas/rest/class/treeview/aciTree.php
diff --git a/vmap/vas/rest/class/vitis_lib/Connection.class.inc b/src/vitis/vas/rest/class/vitis_lib/Connection.class.inc
old mode 100644
new mode 100755
similarity index 100%
rename from vmap/vas/rest/class/vitis_lib/Connection.class.inc
rename to src/vitis/vas/rest/class/vitis_lib/Connection.class.inc
diff --git a/vmap/vas/rest/class/vitis_lib/DbClass.class.inc b/src/vitis/vas/rest/class/vitis_lib/DbClass.class.inc
similarity index 100%
rename from vmap/vas/rest/class/vitis_lib/DbClass.class.inc
rename to src/vitis/vas/rest/class/vitis_lib/DbClass.class.inc
diff --git a/vmap/vas/rest/class/vitis_lib/Form.class.inc b/src/vitis/vas/rest/class/vitis_lib/Form.class.inc
similarity index 100%
rename from vmap/vas/rest/class/vitis_lib/Form.class.inc
rename to src/vitis/vas/rest/class/vitis_lib/Form.class.inc
diff --git a/vmap/vas/rest/class/vitis_lib/VitisError.class.inc b/src/vitis/vas/rest/class/vitis_lib/VitisError.class.inc
old mode 100755
new mode 100644
similarity index 91%
rename from vmap/vas/rest/class/vitis_lib/VitisError.class.inc
rename to src/vitis/vas/rest/class/vitis_lib/VitisError.class.inc
index 28d5275e13f60d8a1979e785170c3df80793c876..0d61f69fcd02cf3cf89e8758a57bb2723d85eef4
--- a/vmap/vas/rest/class/vitis_lib/VitisError.class.inc
+++ b/src/vitis/vas/rest/class/vitis_lib/VitisError.class.inc
@@ -55,6 +55,9 @@ class VitisError extends DbClass  {
 			case 16 :
 				$this->aFields['errorType']="Invalid token";
 			break;
+			case 18 :
+				$this->aFields['errorType']="Missing privileges";
+			break;
 		}
 		$this->aFields['errorMessage']=$sMessage; //Message renvoyé par la base de donnée
     }
diff --git a/vmap/vas/rest/class/vitis_lib/XmlAbstract.class.inc b/src/vitis/vas/rest/class/vitis_lib/XmlAbstract.class.inc
similarity index 100%
rename from vmap/vas/rest/class/vitis_lib/XmlAbstract.class.inc
rename to src/vitis/vas/rest/class/vitis_lib/XmlAbstract.class.inc
diff --git a/vmap/vas/rest/class/vmlib/BD.class.inc b/src/vitis/vas/rest/class/vmlib/BD.class.inc
old mode 100644
new mode 100755
similarity index 100%
rename from vmap/vas/rest/class/vmlib/BD.class.inc
rename to src/vitis/vas/rest/class/vmlib/BD.class.inc
diff --git a/vmap/vas/rest/class/vmlib/BdDataAccess.inc b/src/vitis/vas/rest/class/vmlib/BdDataAccess.inc
similarity index 100%
rename from vmap/vas/rest/class/vmlib/BdDataAccess.inc
rename to src/vitis/vas/rest/class/vmlib/BdDataAccess.inc
diff --git a/vmap/vas/rest/class/vmlib/Email.class.inc b/src/vitis/vas/rest/class/vmlib/Email.class.inc
similarity index 100%
rename from vmap/vas/rest/class/vmlib/Email.class.inc
rename to src/vitis/vas/rest/class/vmlib/Email.class.inc
diff --git a/vmap/vas/rest/class/vmlib/EmailTemplate.class.inc b/src/vitis/vas/rest/class/vmlib/EmailTemplate.class.inc
similarity index 100%
rename from vmap/vas/rest/class/vmlib/EmailTemplate.class.inc
rename to src/vitis/vas/rest/class/vmlib/EmailTemplate.class.inc
diff --git a/vmap/vas/rest/class/vmlib/EmailTemplate.class.sql.inc b/src/vitis/vas/rest/class/vmlib/EmailTemplate.class.sql.inc
similarity index 100%
rename from vmap/vas/rest/class/vmlib/EmailTemplate.class.sql.inc
rename to src/vitis/vas/rest/class/vmlib/EmailTemplate.class.sql.inc
diff --git a/vmap/vas/rest/class/vmlib/Ldap.class.inc b/src/vitis/vas/rest/class/vmlib/Ldap.class.inc
similarity index 100%
rename from vmap/vas/rest/class/vmlib/Ldap.class.inc
rename to src/vitis/vas/rest/class/vmlib/Ldap.class.inc
diff --git a/vmap/vas/rest/class/vmlib/PgsqlDataAccess.class.inc b/src/vitis/vas/rest/class/vmlib/PgsqlDataAccess.class.inc
similarity index 100%
rename from vmap/vas/rest/class/vmlib/PgsqlDataAccess.class.inc
rename to src/vitis/vas/rest/class/vmlib/PgsqlDataAccess.class.inc
diff --git a/vmap/vas/rest/class/vmlib/PostgisUtil.class.inc b/src/vitis/vas/rest/class/vmlib/PostgisUtil.class.inc
similarity index 100%
rename from vmap/vas/rest/class/vmlib/PostgisUtil.class.inc
rename to src/vitis/vas/rest/class/vmlib/PostgisUtil.class.inc
diff --git a/vmap/vas/rest/class/vmlib/Vm.class.inc b/src/vitis/vas/rest/class/vmlib/Vm.class.inc
similarity index 100%
rename from vmap/vas/rest/class/vmlib/Vm.class.inc
rename to src/vitis/vas/rest/class/vmlib/Vm.class.inc
diff --git a/vmap/vas/rest/class/vmlib/Vm.class.sql.inc b/src/vitis/vas/rest/class/vmlib/Vm.class.sql.inc
similarity index 100%
rename from vmap/vas/rest/class/vmlib/Vm.class.sql.inc
rename to src/vitis/vas/rest/class/vmlib/Vm.class.sql.inc
diff --git a/vmap/vas/rest/class/vmlib/class.websocket_client.php b/src/vitis/vas/rest/class/vmlib/class.websocket_client.php
similarity index 100%
rename from vmap/vas/rest/class/vmlib/class.websocket_client.php
rename to src/vitis/vas/rest/class/vmlib/class.websocket_client.php
diff --git a/vmap/vas/rest/class/vmlib/coffeescript/class.jstocoffee.php b/src/vitis/vas/rest/class/vmlib/coffeescript/class.jstocoffee.php
similarity index 100%
rename from vmap/vas/rest/class/vmlib/coffeescript/class.jstocoffee.php
rename to src/vitis/vas/rest/class/vmlib/coffeescript/class.jstocoffee.php
diff --git a/vmap/vas/rest/class/vmlib/coffeescript/classes/errors.php b/src/vitis/vas/rest/class/vmlib/coffeescript/classes/errors.php
similarity index 100%
rename from vmap/vas/rest/class/vmlib/coffeescript/classes/errors.php
rename to src/vitis/vas/rest/class/vmlib/coffeescript/classes/errors.php
diff --git a/vmap/vas/rest/class/vmlib/coffeescript/classes/helpers.php b/src/vitis/vas/rest/class/vmlib/coffeescript/classes/helpers.php
similarity index 100%
rename from vmap/vas/rest/class/vmlib/coffeescript/classes/helpers.php
rename to src/vitis/vas/rest/class/vmlib/coffeescript/classes/helpers.php
diff --git a/vmap/vas/rest/class/vmlib/coffeescript/classes/lexer.php b/src/vitis/vas/rest/class/vmlib/coffeescript/classes/lexer.php
similarity index 100%
rename from vmap/vas/rest/class/vmlib/coffeescript/classes/lexer.php
rename to src/vitis/vas/rest/class/vmlib/coffeescript/classes/lexer.php
diff --git a/vmap/vas/rest/class/vmlib/coffeescript/classes/nodes.php b/src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes.php
similarity index 100%
rename from vmap/vas/rest/class/vmlib/coffeescript/classes/nodes.php
rename to src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes.php
diff --git a/vmap/vas/rest/class/vmlib/coffeescript/classes/nodes/access.php b/src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes/access.php
similarity index 100%
rename from vmap/vas/rest/class/vmlib/coffeescript/classes/nodes/access.php
rename to src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes/access.php
diff --git a/vmap/vas/rest/class/vmlib/coffeescript/classes/nodes/arr.php b/src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes/arr.php
similarity index 100%
rename from vmap/vas/rest/class/vmlib/coffeescript/classes/nodes/arr.php
rename to src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes/arr.php
diff --git a/vmap/vas/rest/class/vmlib/coffeescript/classes/nodes/assign.php b/src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes/assign.php
similarity index 100%
rename from vmap/vas/rest/class/vmlib/coffeescript/classes/nodes/assign.php
rename to src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes/assign.php
diff --git a/vmap/vas/rest/class/vmlib/coffeescript/classes/nodes/base.php b/src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes/base.php
similarity index 100%
rename from vmap/vas/rest/class/vmlib/coffeescript/classes/nodes/base.php
rename to src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes/base.php
diff --git a/vmap/vas/rest/class/vmlib/coffeescript/classes/nodes/block.php b/src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes/block.php
similarity index 100%
rename from vmap/vas/rest/class/vmlib/coffeescript/classes/nodes/block.php
rename to src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes/block.php
diff --git a/vmap/vas/rest/class/vmlib/coffeescript/classes/nodes/call.php b/src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes/call.php
similarity index 100%
rename from vmap/vas/rest/class/vmlib/coffeescript/classes/nodes/call.php
rename to src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes/call.php
diff --git a/vmap/vas/rest/class/vmlib/coffeescript/classes/nodes/class.php b/src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes/class.php
similarity index 100%
rename from vmap/vas/rest/class/vmlib/coffeescript/classes/nodes/class.php
rename to src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes/class.php
diff --git a/vmap/vas/rest/class/vmlib/coffeescript/classes/nodes/closure.php b/src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes/closure.php
similarity index 100%
rename from vmap/vas/rest/class/vmlib/coffeescript/classes/nodes/closure.php
rename to src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes/closure.php
diff --git a/vmap/vas/rest/class/vmlib/coffeescript/classes/nodes/code.php b/src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes/code.php
similarity index 100%
rename from vmap/vas/rest/class/vmlib/coffeescript/classes/nodes/code.php
rename to src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes/code.php
diff --git a/vmap/vas/rest/class/vmlib/coffeescript/classes/nodes/comment.php b/src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes/comment.php
similarity index 100%
rename from vmap/vas/rest/class/vmlib/coffeescript/classes/nodes/comment.php
rename to src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes/comment.php
diff --git a/vmap/vas/rest/class/vmlib/coffeescript/classes/nodes/existence.php b/src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes/existence.php
similarity index 100%
rename from vmap/vas/rest/class/vmlib/coffeescript/classes/nodes/existence.php
rename to src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes/existence.php
diff --git a/vmap/vas/rest/class/vmlib/coffeescript/classes/nodes/extends.php b/src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes/extends.php
similarity index 100%
rename from vmap/vas/rest/class/vmlib/coffeescript/classes/nodes/extends.php
rename to src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes/extends.php
diff --git a/vmap/vas/rest/class/vmlib/coffeescript/classes/nodes/for.php b/src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes/for.php
similarity index 100%
rename from vmap/vas/rest/class/vmlib/coffeescript/classes/nodes/for.php
rename to src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes/for.php
diff --git a/vmap/vas/rest/class/vmlib/coffeescript/classes/nodes/if.php b/src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes/if.php
similarity index 100%
rename from vmap/vas/rest/class/vmlib/coffeescript/classes/nodes/if.php
rename to src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes/if.php
diff --git a/vmap/vas/rest/class/vmlib/coffeescript/classes/nodes/in.php b/src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes/in.php
similarity index 100%
rename from vmap/vas/rest/class/vmlib/coffeescript/classes/nodes/in.php
rename to src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes/in.php
diff --git a/vmap/vas/rest/class/vmlib/coffeescript/classes/nodes/index.php b/src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes/index.php
similarity index 100%
rename from vmap/vas/rest/class/vmlib/coffeescript/classes/nodes/index.php
rename to src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes/index.php
diff --git a/vmap/vas/rest/class/vmlib/coffeescript/classes/nodes/literal.php b/src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes/literal.php
similarity index 100%
rename from vmap/vas/rest/class/vmlib/coffeescript/classes/nodes/literal.php
rename to src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes/literal.php
diff --git a/vmap/vas/rest/class/vmlib/coffeescript/classes/nodes/obj.php b/src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes/obj.php
similarity index 100%
rename from vmap/vas/rest/class/vmlib/coffeescript/classes/nodes/obj.php
rename to src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes/obj.php
diff --git a/vmap/vas/rest/class/vmlib/coffeescript/classes/nodes/op.php b/src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes/op.php
similarity index 100%
rename from vmap/vas/rest/class/vmlib/coffeescript/classes/nodes/op.php
rename to src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes/op.php
diff --git a/vmap/vas/rest/class/vmlib/coffeescript/classes/nodes/param.php b/src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes/param.php
similarity index 100%
rename from vmap/vas/rest/class/vmlib/coffeescript/classes/nodes/param.php
rename to src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes/param.php
diff --git a/vmap/vas/rest/class/vmlib/coffeescript/classes/nodes/parens.php b/src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes/parens.php
similarity index 100%
rename from vmap/vas/rest/class/vmlib/coffeescript/classes/nodes/parens.php
rename to src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes/parens.php
diff --git a/vmap/vas/rest/class/vmlib/coffeescript/classes/nodes/push.php b/src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes/push.php
similarity index 100%
rename from vmap/vas/rest/class/vmlib/coffeescript/classes/nodes/push.php
rename to src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes/push.php
diff --git a/vmap/vas/rest/class/vmlib/coffeescript/classes/nodes/range.php b/src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes/range.php
similarity index 100%
rename from vmap/vas/rest/class/vmlib/coffeescript/classes/nodes/range.php
rename to src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes/range.php
diff --git a/vmap/vas/rest/class/vmlib/coffeescript/classes/nodes/return.php b/src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes/return.php
similarity index 100%
rename from vmap/vas/rest/class/vmlib/coffeescript/classes/nodes/return.php
rename to src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes/return.php
diff --git a/vmap/vas/rest/class/vmlib/coffeescript/classes/nodes/slice.php b/src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes/slice.php
similarity index 100%
rename from vmap/vas/rest/class/vmlib/coffeescript/classes/nodes/slice.php
rename to src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes/slice.php
diff --git a/vmap/vas/rest/class/vmlib/coffeescript/classes/nodes/splat.php b/src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes/splat.php
similarity index 100%
rename from vmap/vas/rest/class/vmlib/coffeescript/classes/nodes/splat.php
rename to src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes/splat.php
diff --git a/vmap/vas/rest/class/vmlib/coffeescript/classes/nodes/switch.php b/src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes/switch.php
similarity index 100%
rename from vmap/vas/rest/class/vmlib/coffeescript/classes/nodes/switch.php
rename to src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes/switch.php
diff --git a/vmap/vas/rest/class/vmlib/coffeescript/classes/nodes/throw.php b/src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes/throw.php
similarity index 100%
rename from vmap/vas/rest/class/vmlib/coffeescript/classes/nodes/throw.php
rename to src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes/throw.php
diff --git a/vmap/vas/rest/class/vmlib/coffeescript/classes/nodes/try.php b/src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes/try.php
similarity index 100%
rename from vmap/vas/rest/class/vmlib/coffeescript/classes/nodes/try.php
rename to src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes/try.php
diff --git a/vmap/vas/rest/class/vmlib/coffeescript/classes/nodes/value.php b/src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes/value.php
similarity index 100%
rename from vmap/vas/rest/class/vmlib/coffeescript/classes/nodes/value.php
rename to src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes/value.php
diff --git a/vmap/vas/rest/class/vmlib/coffeescript/classes/nodes/while.php b/src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes/while.php
similarity index 100%
rename from vmap/vas/rest/class/vmlib/coffeescript/classes/nodes/while.php
rename to src/vitis/vas/rest/class/vmlib/coffeescript/classes/nodes/while.php
diff --git a/vmap/vas/rest/class/vmlib/coffeescript/classes/parser.php b/src/vitis/vas/rest/class/vmlib/coffeescript/classes/parser.php
similarity index 100%
rename from vmap/vas/rest/class/vmlib/coffeescript/classes/parser.php
rename to src/vitis/vas/rest/class/vmlib/coffeescript/classes/parser.php
diff --git a/vmap/vas/rest/class/vmlib/coffeescript/classes/rewriter.php b/src/vitis/vas/rest/class/vmlib/coffeescript/classes/rewriter.php
similarity index 100%
rename from vmap/vas/rest/class/vmlib/coffeescript/classes/rewriter.php
rename to src/vitis/vas/rest/class/vmlib/coffeescript/classes/rewriter.php
diff --git a/vmap/vas/rest/class/vmlib/coffeescript/classes/scope.php b/src/vitis/vas/rest/class/vmlib/coffeescript/classes/scope.php
similarity index 100%
rename from vmap/vas/rest/class/vmlib/coffeescript/classes/scope.php
rename to src/vitis/vas/rest/class/vmlib/coffeescript/classes/scope.php
diff --git a/vmap/vas/rest/class/vmlib/coffeescript/coffeescript.php b/src/vitis/vas/rest/class/vmlib/coffeescript/coffeescript.php
similarity index 100%
rename from vmap/vas/rest/class/vmlib/coffeescript/coffeescript.php
rename to src/vitis/vas/rest/class/vmlib/coffeescript/coffeescript.php
diff --git a/vmap/vas/rest/class/vmlib/coffeescript/jsmaker.php b/src/vitis/vas/rest/class/vmlib/coffeescript/jsmaker.php
similarity index 100%
rename from vmap/vas/rest/class/vmlib/coffeescript/jsmaker.php
rename to src/vitis/vas/rest/class/vmlib/coffeescript/jsmaker.php
diff --git a/vmap/vas/rest/class/vmlib/context/covage.inc b/src/vitis/vas/rest/class/vmlib/context/covage.inc
similarity index 100%
rename from vmap/vas/rest/class/vmlib/context/covage.inc
rename to src/vitis/vas/rest/class/vmlib/context/covage.inc
diff --git a/vmap/vas/rest/class/vmlib/context/gtf.inc b/src/vitis/vas/rest/class/vmlib/context/gtf.inc
similarity index 100%
rename from vmap/vas/rest/class/vmlib/context/gtf.inc
rename to src/vitis/vas/rest/class/vmlib/context/gtf.inc
diff --git a/vmap/vas/rest/class/vmlib/context/message.inc b/src/vitis/vas/rest/class/vmlib/context/message.inc
similarity index 100%
rename from vmap/vas/rest/class/vmlib/context/message.inc
rename to src/vitis/vas/rest/class/vmlib/context/message.inc
diff --git a/vmap/vas/rest/class/vmlib/cryptUtil.inc b/src/vitis/vas/rest/class/vmlib/cryptUtil.inc
similarity index 100%
rename from vmap/vas/rest/class/vmlib/cryptUtil.inc
rename to src/vitis/vas/rest/class/vmlib/cryptUtil.inc
diff --git a/vmap/vas/rest/class/vmlib/dateUtil.class.inc b/src/vitis/vas/rest/class/vmlib/dateUtil.class.inc
similarity index 100%
rename from vmap/vas/rest/class/vmlib/dateUtil.class.inc
rename to src/vitis/vas/rest/class/vmlib/dateUtil.class.inc
diff --git a/vmap/vas/rest/class/vmlib/dbUtil.inc b/src/vitis/vas/rest/class/vmlib/dbUtil.inc
similarity index 100%
rename from vmap/vas/rest/class/vmlib/dbUtil.inc
rename to src/vitis/vas/rest/class/vmlib/dbUtil.inc
diff --git a/vmap/vas/rest/class/vmlib/error.inc b/src/vitis/vas/rest/class/vmlib/error.inc
similarity index 100%
rename from vmap/vas/rest/class/vmlib/error.inc
rename to src/vitis/vas/rest/class/vmlib/error.inc
diff --git a/vmap/vas/rest/class/vmlib/lang_vmlib/en-lang.inc b/src/vitis/vas/rest/class/vmlib/lang_vmlib/en-lang.inc
similarity index 100%
rename from vmap/vas/rest/class/vmlib/lang_vmlib/en-lang.inc
rename to src/vitis/vas/rest/class/vmlib/lang_vmlib/en-lang.inc
diff --git a/vmap/vas/rest/class/vmlib/lang_vmlib/fr-lang.inc b/src/vitis/vas/rest/class/vmlib/lang_vmlib/fr-lang.inc
similarity index 100%
rename from vmap/vas/rest/class/vmlib/lang_vmlib/fr-lang.inc
rename to src/vitis/vas/rest/class/vmlib/lang_vmlib/fr-lang.inc
diff --git a/vmap/vas/rest/class/vmlib/logUtil.inc b/src/vitis/vas/rest/class/vmlib/logUtil.inc
similarity index 100%
rename from vmap/vas/rest/class/vmlib/logUtil.inc
rename to src/vitis/vas/rest/class/vmlib/logUtil.inc
diff --git a/vmap/vas/rest/class/vmlib/phpUtil.inc b/src/vitis/vas/rest/class/vmlib/phpUtil.inc
similarity index 100%
rename from vmap/vas/rest/class/vmlib/phpUtil.inc
rename to src/vitis/vas/rest/class/vmlib/phpUtil.inc
diff --git a/vmap/vas/rest/class/vmlib/stringUtil.inc b/src/vitis/vas/rest/class/vmlib/stringUtil.inc
similarity index 100%
rename from vmap/vas/rest/class/vmlib/stringUtil.inc
rename to src/vitis/vas/rest/class/vmlib/stringUtil.inc
diff --git a/vmap/vas/rest/class/wab_lib/BusinessObject.class.inc b/src/vitis/vas/rest/class/wab_lib/BusinessObject.class.inc
similarity index 100%
rename from vmap/vas/rest/class/wab_lib/BusinessObject.class.inc
rename to src/vitis/vas/rest/class/wab_lib/BusinessObject.class.inc
diff --git a/vmap/vas/rest/class/wab_lib/BusinessObject.class.sql.inc b/src/vitis/vas/rest/class/wab_lib/BusinessObject.class.sql.inc
similarity index 100%
rename from vmap/vas/rest/class/wab_lib/BusinessObject.class.sql.inc
rename to src/vitis/vas/rest/class/wab_lib/BusinessObject.class.sql.inc
diff --git a/vmap/vas/rest/conf/constants.inc b/src/vitis/vas/rest/conf/constants.inc
similarity index 100%
rename from vmap/vas/rest/conf/constants.inc
rename to src/vitis/vas/rest/conf/constants.inc
diff --git a/vmap/vas/rest/conf/php_conf.inc b/src/vitis/vas/rest/conf/php_conf.inc
similarity index 100%
rename from vmap/vas/rest/conf/php_conf.inc
rename to src/vitis/vas/rest/conf/php_conf.inc
diff --git a/vmap/vas/rest/conf/properties.inc b/src/vitis/vas/rest/conf/properties.inc
old mode 100644
new mode 100755
similarity index 100%
rename from vmap/vas/rest/conf/properties.inc
rename to src/vitis/vas/rest/conf/properties.inc
diff --git a/vmap/vas/rest/conf/properties_domain.inc b/src/vitis/vas/rest/conf/properties_domain.inc
similarity index 100%
rename from vmap/vas/rest/conf/properties_domain.inc
rename to src/vitis/vas/rest/conf/properties_domain.inc
diff --git a/vmap/vas/rest/conf/properties_post.inc b/src/vitis/vas/rest/conf/properties_post.inc
similarity index 100%
rename from vmap/vas/rest/conf/properties_post.inc
rename to src/vitis/vas/rest/conf/properties_post.inc
diff --git a/vmap/vas/rest/conf/properties_server.inc b/src/vitis/vas/rest/conf/properties_server.inc
similarity index 77%
rename from vmap/vas/rest/conf/properties_server.inc
rename to src/vitis/vas/rest/conf/properties_server.inc
index dc160a081f7ee0f76ad310cb1f95019f9101141f..2d1208b5fa0df3751e7ddf0cf24b07c7476ef165 100644
--- a/vmap/vas/rest/conf/properties_server.inc
+++ b/src/vitis/vas/rest/conf/properties_server.inc
@@ -18,19 +18,13 @@ $properties['websocket_alias'] = 'websocket[ENV]';
 $properties['environment_alias'] = '[ENV]';
 $properties["vitis_owner_login"] = 'u_vitis';
 $properties["vitis_owner_pass"] = '[U_VITIS_PASSWORD]';
+
+$properties['db_superuser_login'] = $properties["vitis_owner_login"];
+$properties['db_superuser_pass'] = $properties["vitis_owner_pass"];
+
 //inscription automatique
-$properties['advanced_login_page'] = false;
-$properties['automated_sign_up'] = false;
-$properties['mail_tag_subject'] = '[VITIS] ';
 $properties['applink_redirection'] = $properties['web_server_name'] . '/';
-//propriétés existentes dans GTF
-//$properties['mail_sender'] = 'vitis@domaine.com';
-//$properties['nickname_sender'] = 'Vitis';
-//$properties['smtp_host'] = 'smtp.domaine.com';
-//$properties['smtp_port'] = 26;
-//$properties['smtp_authentification'] = true;
-//$properties['smtp_login'] = 'login@domaine.com';
-//$properties['smtp_password'] = 'password';
+
 $properties['SaveSentMail'] = false; 
 //si true remplir le bloc en dessous
 $properties['imapBotSender_host'] = "imap.domaine.com";
@@ -38,10 +32,6 @@ $properties['imapBotSender_port'] = 993;
 $properties['imapBotSender_login'] = "login@domaine.com";
 $properties['imapBotSender_pwd'] = "password";
 $properties['imapBotSender_encrypt'] = "ssl";
-//si automated_sign_up === false
-$properties["admin_sign_up"] = "login@domaine.com"; 
-//pour l'inscription
-$properties["google_private_captcha"] = "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"; 
 //privilèges à donner aux nouveaux inscrits
 $properties['sign_up_automated_roles'] = array();
 //liste des personne à mettre en copie du mail de notification si validation par administrateur (trois separateurs possibles ,| |;)
diff --git a/vmap/vas/rest/conf/selected_properties.inc b/src/vitis/vas/rest/conf/selected_properties.inc
old mode 100644
new mode 100755
similarity index 100%
rename from vmap/vas/rest/conf/selected_properties.inc
rename to src/vitis/vas/rest/conf/selected_properties.inc
diff --git a/vmap/vas/rest/conf/version.inc b/src/vitis/vas/rest/conf/version.inc
similarity index 100%
rename from vmap/vas/rest/conf/version.inc
rename to src/vitis/vas/rest/conf/version.inc
diff --git a/vmap/vas/rest/inc/MetadataAccess.class.inc b/src/vitis/vas/rest/inc/MetadataAccess.class.inc
similarity index 100%
rename from vmap/vas/rest/inc/MetadataAccess.class.inc
rename to src/vitis/vas/rest/inc/MetadataAccess.class.inc
diff --git a/vmap/vas/rest/inc/MetadataAccess.sql.inc b/src/vitis/vas/rest/inc/MetadataAccess.sql.inc
similarity index 100%
rename from vmap/vas/rest/inc/MetadataAccess.sql.inc
rename to src/vitis/vas/rest/inc/MetadataAccess.sql.inc
diff --git a/vmap/vas/rest/index.phtml b/src/vitis/vas/rest/index.phtml
similarity index 100%
rename from vmap/vas/rest/index.phtml
rename to src/vitis/vas/rest/index.phtml
diff --git a/vmap/vas/rest/index.vhtml b/src/vitis/vas/rest/index.vhtml
similarity index 100%
rename from vmap/vas/rest/index.vhtml
rename to src/vitis/vas/rest/index.vhtml
diff --git a/vmap/vas/rest/ws/vitis/Accounts.class.inc b/src/vitis/vas/rest/ws/vitis/Accounts.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vitis/Accounts.class.inc
rename to src/vitis/vas/rest/ws/vitis/Accounts.class.inc
diff --git a/vmap/vas/rest/ws/vitis/Accounts.class.mail.inc b/src/vitis/vas/rest/ws/vitis/Accounts.class.mail.inc
similarity index 100%
rename from vmap/vas/rest/ws/vitis/Accounts.class.mail.inc
rename to src/vitis/vas/rest/ws/vitis/Accounts.class.mail.inc
diff --git a/vmap/vas/rest/ws/vitis/Accounts.class.sql.inc b/src/vitis/vas/rest/ws/vitis/Accounts.class.sql.inc
similarity index 100%
rename from vmap/vas/rest/ws/vitis/Accounts.class.sql.inc
rename to src/vitis/vas/rest/ws/vitis/Accounts.class.sql.inc
diff --git a/vmap/vas/rest/ws/vitis/Action.class.inc b/src/vitis/vas/rest/ws/vitis/Action.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vitis/Action.class.inc
rename to src/vitis/vas/rest/ws/vitis/Action.class.inc
diff --git a/vmap/vas/rest/ws/vitis/Actions.class.inc b/src/vitis/vas/rest/ws/vitis/Actions.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vitis/Actions.class.inc
rename to src/vitis/vas/rest/ws/vitis/Actions.class.inc
diff --git a/vmap/vas/rest/ws/vitis/ActiveDirectory.class.inc b/src/vitis/vas/rest/ws/vitis/ActiveDirectory.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vitis/ActiveDirectory.class.inc
rename to src/vitis/vas/rest/ws/vitis/ActiveDirectory.class.inc
diff --git a/vmap/vas/rest/ws/vitis/BillingGroup.class.inc b/src/vitis/vas/rest/ws/vitis/BillingGroup.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vitis/BillingGroup.class.inc
rename to src/vitis/vas/rest/ws/vitis/BillingGroup.class.inc
diff --git a/vmap/vas/rest/ws/vitis/BillingGroups.class.inc b/src/vitis/vas/rest/ws/vitis/BillingGroups.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vitis/BillingGroups.class.inc
rename to src/vitis/vas/rest/ws/vitis/BillingGroups.class.inc
diff --git a/vmap/vas/rest/ws/vitis/Column.class.inc b/src/vitis/vas/rest/ws/vitis/Column.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vitis/Column.class.inc
rename to src/vitis/vas/rest/ws/vitis/Column.class.inc
diff --git a/vmap/vas/rest/ws/vitis/Columns.class.inc b/src/vitis/vas/rest/ws/vitis/Columns.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vitis/Columns.class.inc
rename to src/vitis/vas/rest/ws/vitis/Columns.class.inc
diff --git a/vmap/vas/rest/ws/vitis/Database.class.inc b/src/vitis/vas/rest/ws/vitis/Database.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vitis/Database.class.inc
rename to src/vitis/vas/rest/ws/vitis/Database.class.inc
diff --git a/vmap/vas/rest/ws/vitis/Domain.class.inc b/src/vitis/vas/rest/ws/vitis/Domain.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vitis/Domain.class.inc
rename to src/vitis/vas/rest/ws/vitis/Domain.class.inc
diff --git a/vmap/vas/rest/ws/vitis/Domains.class.inc b/src/vitis/vas/rest/ws/vitis/Domains.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vitis/Domains.class.inc
rename to src/vitis/vas/rest/ws/vitis/Domains.class.inc
diff --git a/vmap/vas/rest/ws/vitis/FormatDate.class.inc b/src/vitis/vas/rest/ws/vitis/FormatDate.class.inc
old mode 100644
new mode 100755
similarity index 100%
rename from vmap/vas/rest/ws/vitis/FormatDate.class.inc
rename to src/vitis/vas/rest/ws/vitis/FormatDate.class.inc
diff --git a/vmap/vas/rest/ws/vitis/FormatDates.class.inc b/src/vitis/vas/rest/ws/vitis/FormatDates.class.inc
old mode 100644
new mode 100755
similarity index 100%
rename from vmap/vas/rest/ws/vitis/FormatDates.class.inc
rename to src/vitis/vas/rest/ws/vitis/FormatDates.class.inc
diff --git a/vmap/vas/rest/ws/vitis/GenericQuery.class.inc b/src/vitis/vas/rest/ws/vitis/GenericQuery.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vitis/GenericQuery.class.inc
rename to src/vitis/vas/rest/ws/vitis/GenericQuery.class.inc
diff --git a/vmap/vas/rest/ws/vitis/GenericQuerys.class.inc b/src/vitis/vas/rest/ws/vitis/GenericQuerys.class.inc
old mode 100644
new mode 100755
similarity index 100%
rename from vmap/vas/rest/ws/vitis/GenericQuerys.class.inc
rename to src/vitis/vas/rest/ws/vitis/GenericQuerys.class.inc
diff --git a/vmap/vas/rest/ws/vitis/GenericQuerys.class.sql.inc b/src/vitis/vas/rest/ws/vitis/GenericQuerys.class.sql.inc
similarity index 100%
rename from vmap/vas/rest/ws/vitis/GenericQuerys.class.sql.inc
rename to src/vitis/vas/rest/ws/vitis/GenericQuerys.class.sql.inc
diff --git a/vmap/vas/rest/ws/vitis/Group.class.inc b/src/vitis/vas/rest/ws/vitis/Group.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vitis/Group.class.inc
rename to src/vitis/vas/rest/ws/vitis/Group.class.inc
diff --git a/vmap/vas/rest/ws/vitis/Groups.class.inc b/src/vitis/vas/rest/ws/vitis/Groups.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vitis/Groups.class.inc
rename to src/vitis/vas/rest/ws/vitis/Groups.class.inc
diff --git a/vmap/vas/rest/ws/vitis/Logs.class.inc b/src/vitis/vas/rest/ws/vitis/Logs.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vitis/Logs.class.inc
rename to src/vitis/vas/rest/ws/vitis/Logs.class.inc
diff --git a/vmap/vas/rest/ws/vitis/Mode.class.inc b/src/vitis/vas/rest/ws/vitis/Mode.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vitis/Mode.class.inc
rename to src/vitis/vas/rest/ws/vitis/Mode.class.inc
diff --git a/vmap/vas/rest/ws/vitis/Modes.class.inc b/src/vitis/vas/rest/ws/vitis/Modes.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vitis/Modes.class.inc
rename to src/vitis/vas/rest/ws/vitis/Modes.class.inc
diff --git a/vmap/vas/rest/ws/vitis/PhpInfo.class.inc b/src/vitis/vas/rest/ws/vitis/PhpInfo.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vitis/PhpInfo.class.inc
rename to src/vitis/vas/rest/ws/vitis/PhpInfo.class.inc
diff --git a/vmap/vas/rest/ws/vitis/PrivateToken.class.inc b/src/vitis/vas/rest/ws/vitis/PrivateToken.class.inc
similarity index 97%
rename from vmap/vas/rest/ws/vitis/PrivateToken.class.inc
rename to src/vitis/vas/rest/ws/vitis/PrivateToken.class.inc
index c3d9048ed6ae709d6b986558a01b908fce6099b0..649dc10c0bc7100d38721af81cab49b19706eab2 100644
--- a/vmap/vas/rest/ws/vitis/PrivateToken.class.inc
+++ b/src/vitis/vas/rest/ws/vitis/PrivateToken.class.inc
@@ -151,7 +151,7 @@ class PrivateToken extends Vitis {
                 $aParams['sLogin'] = array('value' => $this->aValues["user"], 'type' => 'string');
                 $oPDOresult = $oBd->executeWithParams($aSql['getUserConnectionPrivileges'], $aParams);
                 if ($oBd->nombreLigne($oPDOresult) == 0) {
-                    $oError = new VitisError(1, "No 'vitis_user' privilege.");
+                    $oError = new VitisError(18, "No 'vitis_user' privilege.");
                     $aXmlRacineAttribute['status'] = 0;
                     $sMessage = $oError->asDocument('', 'vitis', $this->aValues['sEncoding'], True, $aXmlRacineAttribute, $this->aValues['sSourceEncoding'], $this->aValues['output']);
                     writeToErrorLog("ERROR : No 'vitis_user' privilege for user '" . $this->aValues["user"] . "'.");
diff --git a/vmap/vas/rest/ws/vitis/Privilege.class.inc b/src/vitis/vas/rest/ws/vitis/Privilege.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vitis/Privilege.class.inc
rename to src/vitis/vas/rest/ws/vitis/Privilege.class.inc
diff --git a/vmap/vas/rest/ws/vitis/Privileges.class.inc b/src/vitis/vas/rest/ws/vitis/Privileges.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vitis/Privileges.class.inc
rename to src/vitis/vas/rest/ws/vitis/Privileges.class.inc
diff --git a/vmap/vas/rest/ws/vitis/Properties.class.inc b/src/vitis/vas/rest/ws/vitis/Properties.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vitis/Properties.class.inc
rename to src/vitis/vas/rest/ws/vitis/Properties.class.inc
diff --git a/vmap/vas/rest/ws/vitis/PublicToken.class.inc b/src/vitis/vas/rest/ws/vitis/PublicToken.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vitis/PublicToken.class.inc
rename to src/vitis/vas/rest/ws/vitis/PublicToken.class.inc
diff --git a/vmap/vas/rest/ws/vitis/Ressources.class.inc b/src/vitis/vas/rest/ws/vitis/Ressources.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vitis/Ressources.class.inc
rename to src/vitis/vas/rest/ws/vitis/Ressources.class.inc
diff --git a/vmap/vas/rest/ws/vitis/Schema.class.inc b/src/vitis/vas/rest/ws/vitis/Schema.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vitis/Schema.class.inc
rename to src/vitis/vas/rest/ws/vitis/Schema.class.inc
diff --git a/vmap/vas/rest/ws/vitis/SmtpServer.class.inc b/src/vitis/vas/rest/ws/vitis/SmtpServer.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vitis/SmtpServer.class.inc
rename to src/vitis/vas/rest/ws/vitis/SmtpServer.class.inc
diff --git a/vmap/vas/rest/ws/vitis/Tab.class.inc b/src/vitis/vas/rest/ws/vitis/Tab.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vitis/Tab.class.inc
rename to src/vitis/vas/rest/ws/vitis/Tab.class.inc
diff --git a/vmap/vas/rest/ws/vitis/Table.class.inc b/src/vitis/vas/rest/ws/vitis/Table.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vitis/Table.class.inc
rename to src/vitis/vas/rest/ws/vitis/Table.class.inc
diff --git a/vmap/vas/rest/ws/vitis/Tabs.class.inc b/src/vitis/vas/rest/ws/vitis/Tabs.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vitis/Tabs.class.inc
rename to src/vitis/vas/rest/ws/vitis/Tabs.class.inc
diff --git a/vmap/vas/rest/ws/vitis/TimeZone.class.inc b/src/vitis/vas/rest/ws/vitis/TimeZone.class.inc
old mode 100644
new mode 100755
similarity index 100%
rename from vmap/vas/rest/ws/vitis/TimeZone.class.inc
rename to src/vitis/vas/rest/ws/vitis/TimeZone.class.inc
diff --git a/vmap/vas/rest/ws/vitis/TimeZones.class.inc b/src/vitis/vas/rest/ws/vitis/TimeZones.class.inc
old mode 100644
new mode 100755
similarity index 100%
rename from vmap/vas/rest/ws/vitis/TimeZones.class.inc
rename to src/vitis/vas/rest/ws/vitis/TimeZones.class.inc
diff --git a/vmap/vas/rest/ws/vitis/User.class.inc b/src/vitis/vas/rest/ws/vitis/User.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vitis/User.class.inc
rename to src/vitis/vas/rest/ws/vitis/User.class.inc
diff --git a/vmap/vas/rest/ws/vitis/Users.class.inc b/src/vitis/vas/rest/ws/vitis/Users.class.inc
old mode 100644
new mode 100755
similarity index 100%
rename from vmap/vas/rest/ws/vitis/Users.class.inc
rename to src/vitis/vas/rest/ws/vitis/Users.class.inc
diff --git a/vmap/vas/rest/ws/vitis/Versions.class.inc b/src/vitis/vas/rest/ws/vitis/Versions.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vitis/Versions.class.inc
rename to src/vitis/vas/rest/ws/vitis/Versions.class.inc
diff --git a/vmap/vas/rest/ws/vitis/Vitis.class.inc b/src/vitis/vas/rest/ws/vitis/Vitis.class.inc
similarity index 97%
rename from vmap/vas/rest/ws/vitis/Vitis.class.inc
rename to src/vitis/vas/rest/ws/vitis/Vitis.class.inc
index 83b0d97e5f15d0685d4e6721c1144a860a66d207..8a8bb421b700c0ed3043039ef9102172b187c55c 100755
--- a/vmap/vas/rest/ws/vitis/Vitis.class.inc
+++ b/src/vitis/vas/rest/ws/vitis/Vitis.class.inc
@@ -370,7 +370,7 @@ class Vitis extends DbClass {
                                     break;
                             }
                         }
-                        
+
                         if (!empty($this->aValues['null_order'])) {
                             switch (strtoupper($this->aValues['null_order'])) {
                                 case 'LAST':
@@ -1287,9 +1287,9 @@ class Vitis extends DbClass {
                     }
                     $sIntersectFilter = '(' . $sIntersectFilter . ') OR ((' . $sNoBufferTypesFilter . ') AND ' . $sBufferFilter . ')';
                 }
-                
+
                 // Ajout au filtre
-                $sFilter .= $sIntersectFilter;
+                $sFilter .= '(' . $sIntersectFilter . ')';
                 break;
             default:
                 // Ajoute les paramètres
diff --git a/vmap/vas/rest/ws/vitis/Vitis.class.sql.inc b/src/vitis/vas/rest/ws/vitis/Vitis.class.sql.inc
similarity index 100%
rename from vmap/vas/rest/ws/vitis/Vitis.class.sql.inc
rename to src/vitis/vas/rest/ws/vitis/Vitis.class.sql.inc
diff --git a/vmap/vas/rest/ws/vitis/VitisSection.class.inc b/src/vitis/vas/rest/ws/vitis/VitisSection.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vitis/VitisSection.class.inc
rename to src/vitis/vas/rest/ws/vitis/VitisSection.class.inc
diff --git a/vmap/vas/rest/ws/vitis/VitisSections.class.inc b/src/vitis/vas/rest/ws/vitis/VitisSections.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vitis/VitisSections.class.inc
rename to src/vitis/vas/rest/ws/vitis/VitisSections.class.inc
diff --git a/vmap/vas/rest/ws/vitis/WebServices.class.inc b/src/vitis/vas/rest/ws/vitis/WebServices.class.inc
similarity index 100%
rename from vmap/vas/rest/ws/vitis/WebServices.class.inc
rename to src/vitis/vas/rest/ws/vitis/WebServices.class.inc
diff --git a/vmap/vas/rest/ws/vitis/overview.phtml b/src/vitis/vas/rest/ws/vitis/overview.phtml
similarity index 100%
rename from vmap/vas/rest/ws/vitis/overview.phtml
rename to src/vitis/vas/rest/ws/vitis/overview.phtml
diff --git a/vmap/vas/sql/sqlQueries.xml b/src/vitis/vas/sql/sqlQueries.xml
old mode 100644
new mode 100755
similarity index 100%
rename from vmap/vas/sql/sqlQueries.xml
rename to src/vitis/vas/sql/sqlQueries.xml
diff --git a/src/vitis/vas/tmp/file_to_delete.txt b/src/vitis/vas/tmp/file_to_delete.txt
new file mode 100755
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/vmap/vas/util/coordsys.txt b/src/vitis/vas/util/coordsys.txt
similarity index 100%
rename from vmap/vas/util/coordsys.txt
rename to src/vitis/vas/util/coordsys.txt
diff --git a/vmap/vas/util/migration/anc/SplitAddress.fmx b/src/vitis/vas/util/migration/anc/SplitAddress.fmx
similarity index 100%
rename from vmap/vas/util/migration/anc/SplitAddress.fmx
rename to src/vitis/vas/util/migration/anc/SplitAddress.fmx
diff --git a/vmap/vas/util/migration/anc/lisez-moi.txt b/src/vitis/vas/util/migration/anc/lisez-moi.txt
similarity index 100%
rename from vmap/vas/util/migration/anc/lisez-moi.txt
rename to src/vitis/vas/util/migration/anc/lisez-moi.txt
diff --git a/vmap/vas/util/migration/anc/migration_anc_veremap__vmap.fmw b/src/vitis/vas/util/migration/anc/migration_anc_veremap__vmap.fmw
similarity index 100%
rename from vmap/vas/util/migration/anc/migration_anc_veremap__vmap.fmw
rename to src/vitis/vas/util/migration/anc/migration_anc_veremap__vmap.fmw
diff --git a/vmap/vas/util/migration/migration_user_and_group.fmw b/src/vitis/vas/util/migration/migration_user_and_group.fmw
similarity index 100%
rename from vmap/vas/util/migration/migration_user_and_group.fmw
rename to src/vitis/vas/util/migration/migration_user_and_group.fmw
diff --git a/vmap/vas/util/migration/migration_veremap_layer.fmw b/src/vitis/vas/util/migration/migration_veremap_layer.fmw
similarity index 100%
rename from vmap/vas/util/migration/migration_veremap_layer.fmw
rename to src/vitis/vas/util/migration/migration_veremap_layer.fmw
diff --git a/vmap/vas/util/printserver/client/lib/angular/LICENSE b/src/vitis/vas/util/printserver/client/lib/angular/LICENSE
similarity index 100%
rename from vmap/vas/util/printserver/client/lib/angular/LICENSE
rename to src/vitis/vas/util/printserver/client/lib/angular/LICENSE
diff --git a/vmap/vas/util/printserver/client/lib/angular/angular.js b/src/vitis/vas/util/printserver/client/lib/angular/angular.js
similarity index 100%
rename from vmap/vas/util/printserver/client/lib/angular/angular.js
rename to src/vitis/vas/util/printserver/client/lib/angular/angular.js
diff --git a/vmap/vas/util/printserver/client/lib/angular/angular.min.js b/src/vitis/vas/util/printserver/client/lib/angular/angular.min.js
similarity index 100%
rename from vmap/vas/util/printserver/client/lib/angular/angular.min.js
rename to src/vitis/vas/util/printserver/client/lib/angular/angular.min.js
diff --git a/vmap/vas/util/printserver/client/lib/angular/angular.min.js.map b/src/vitis/vas/util/printserver/client/lib/angular/angular.min.js.map
similarity index 100%
rename from vmap/vas/util/printserver/client/lib/angular/angular.min.js.map
rename to src/vitis/vas/util/printserver/client/lib/angular/angular.min.js.map
diff --git a/vmap/vas/util/printserver/client/lib/angular/modules/angular-route/angular-route.js b/src/vitis/vas/util/printserver/client/lib/angular/modules/angular-route/angular-route.js
similarity index 100%
rename from vmap/vas/util/printserver/client/lib/angular/modules/angular-route/angular-route.js
rename to src/vitis/vas/util/printserver/client/lib/angular/modules/angular-route/angular-route.js
diff --git a/vmap/vas/util/printserver/client/lib/angular/modules/angular-translate/LICENSE b/src/vitis/vas/util/printserver/client/lib/angular/modules/angular-translate/LICENSE
similarity index 100%
rename from vmap/vas/util/printserver/client/lib/angular/modules/angular-translate/LICENSE
rename to src/vitis/vas/util/printserver/client/lib/angular/modules/angular-translate/LICENSE
diff --git a/vmap/vas/util/printserver/client/lib/angular/modules/angular-translate/angular-translate-loader-partial.js b/src/vitis/vas/util/printserver/client/lib/angular/modules/angular-translate/angular-translate-loader-partial.js
similarity index 100%
rename from vmap/vas/util/printserver/client/lib/angular/modules/angular-translate/angular-translate-loader-partial.js
rename to src/vitis/vas/util/printserver/client/lib/angular/modules/angular-translate/angular-translate-loader-partial.js
diff --git a/vmap/vas/util/printserver/client/lib/angular/modules/angular-translate/angular-translate-loader-partial.min.js b/src/vitis/vas/util/printserver/client/lib/angular/modules/angular-translate/angular-translate-loader-partial.min.js
similarity index 100%
rename from vmap/vas/util/printserver/client/lib/angular/modules/angular-translate/angular-translate-loader-partial.min.js
rename to src/vitis/vas/util/printserver/client/lib/angular/modules/angular-translate/angular-translate-loader-partial.min.js
diff --git a/vmap/vas/util/printserver/client/lib/angular/modules/angular-translate/angular-translate-loader-static-files.js b/src/vitis/vas/util/printserver/client/lib/angular/modules/angular-translate/angular-translate-loader-static-files.js
similarity index 100%
rename from vmap/vas/util/printserver/client/lib/angular/modules/angular-translate/angular-translate-loader-static-files.js
rename to src/vitis/vas/util/printserver/client/lib/angular/modules/angular-translate/angular-translate-loader-static-files.js
diff --git a/vmap/vas/util/printserver/client/lib/angular/modules/angular-translate/angular-translate-loader-static-files.min.js b/src/vitis/vas/util/printserver/client/lib/angular/modules/angular-translate/angular-translate-loader-static-files.min.js
similarity index 100%
rename from vmap/vas/util/printserver/client/lib/angular/modules/angular-translate/angular-translate-loader-static-files.min.js
rename to src/vitis/vas/util/printserver/client/lib/angular/modules/angular-translate/angular-translate-loader-static-files.min.js
diff --git a/vmap/vas/util/printserver/client/lib/angular/modules/angular-translate/angular-translate.js b/src/vitis/vas/util/printserver/client/lib/angular/modules/angular-translate/angular-translate.js
similarity index 100%
rename from vmap/vas/util/printserver/client/lib/angular/modules/angular-translate/angular-translate.js
rename to src/vitis/vas/util/printserver/client/lib/angular/modules/angular-translate/angular-translate.js
diff --git a/vmap/vas/util/printserver/client/lib/angular/modules/angular-translate/angular-translate.min.js b/src/vitis/vas/util/printserver/client/lib/angular/modules/angular-translate/angular-translate.min.js
similarity index 100%
rename from vmap/vas/util/printserver/client/lib/angular/modules/angular-translate/angular-translate.min.js
rename to src/vitis/vas/util/printserver/client/lib/angular/modules/angular-translate/angular-translate.min.js
diff --git a/vmap/vas/util/printserver/client/lib/angular/modules/sanitize/angular-sanitize.js b/src/vitis/vas/util/printserver/client/lib/angular/modules/sanitize/angular-sanitize.js
similarity index 100%
rename from vmap/vas/util/printserver/client/lib/angular/modules/sanitize/angular-sanitize.js
rename to src/vitis/vas/util/printserver/client/lib/angular/modules/sanitize/angular-sanitize.js
diff --git a/vmap/vas/util/printserver/client/lib/angular/modules/sanitize/angular-sanitize.min.js b/src/vitis/vas/util/printserver/client/lib/angular/modules/sanitize/angular-sanitize.min.js
similarity index 100%
rename from vmap/vas/util/printserver/client/lib/angular/modules/sanitize/angular-sanitize.min.js
rename to src/vitis/vas/util/printserver/client/lib/angular/modules/sanitize/angular-sanitize.min.js
diff --git a/vmap/vas/util/printserver/client/lib/angular/modules/sanitize/angular-sanitize.min.js.map b/src/vitis/vas/util/printserver/client/lib/angular/modules/sanitize/angular-sanitize.min.js.map
similarity index 100%
rename from vmap/vas/util/printserver/client/lib/angular/modules/sanitize/angular-sanitize.min.js.map
rename to src/vitis/vas/util/printserver/client/lib/angular/modules/sanitize/angular-sanitize.min.js.map
diff --git a/vmap/vas/util/printserver/client/lib/angular/modules/ui-codemirror/LICENSE b/src/vitis/vas/util/printserver/client/lib/angular/modules/ui-codemirror/LICENSE
similarity index 100%
rename from vmap/vas/util/printserver/client/lib/angular/modules/ui-codemirror/LICENSE
rename to src/vitis/vas/util/printserver/client/lib/angular/modules/ui-codemirror/LICENSE
diff --git a/vmap/vas/util/printserver/client/lib/angular/modules/ui-codemirror/ui-codemirror.min.js b/src/vitis/vas/util/printserver/client/lib/angular/modules/ui-codemirror/ui-codemirror.min.js
similarity index 100%
rename from vmap/vas/util/printserver/client/lib/angular/modules/ui-codemirror/ui-codemirror.min.js
rename to src/vitis/vas/util/printserver/client/lib/angular/modules/ui-codemirror/ui-codemirror.min.js
diff --git a/vmap/vas/util/printserver/client/lib/angular/modules/ui-grid/LICENSE.md b/src/vitis/vas/util/printserver/client/lib/angular/modules/ui-grid/LICENSE.md
similarity index 100%
rename from vmap/vas/util/printserver/client/lib/angular/modules/ui-grid/LICENSE.md
rename to src/vitis/vas/util/printserver/client/lib/angular/modules/ui-grid/LICENSE.md
diff --git a/vmap/vas/util/printserver/client/lib/angular/modules/ui-grid/plugins/draggable-rows.js b/src/vitis/vas/util/printserver/client/lib/angular/modules/ui-grid/plugins/draggable-rows.js
similarity index 100%
rename from vmap/vas/util/printserver/client/lib/angular/modules/ui-grid/plugins/draggable-rows.js
rename to src/vitis/vas/util/printserver/client/lib/angular/modules/ui-grid/plugins/draggable-rows.js
diff --git a/vmap/vas/util/printserver/client/lib/angular/modules/ui-grid/ui-grid.js b/src/vitis/vas/util/printserver/client/lib/angular/modules/ui-grid/ui-grid.js
similarity index 100%
rename from vmap/vas/util/printserver/client/lib/angular/modules/ui-grid/ui-grid.js
rename to src/vitis/vas/util/printserver/client/lib/angular/modules/ui-grid/ui-grid.js
diff --git a/vmap/vas/util/printserver/client/lib/angular/modules/ui-grid/ui-grid.min.js b/src/vitis/vas/util/printserver/client/lib/angular/modules/ui-grid/ui-grid.min.js
similarity index 100%
rename from vmap/vas/util/printserver/client/lib/angular/modules/ui-grid/ui-grid.min.js
rename to src/vitis/vas/util/printserver/client/lib/angular/modules/ui-grid/ui-grid.min.js
diff --git a/vmap/vas/util/printserver/client/lib/angular/modules/ui-tinymce/LICENSE b/src/vitis/vas/util/printserver/client/lib/angular/modules/ui-tinymce/LICENSE
similarity index 100%
rename from vmap/vas/util/printserver/client/lib/angular/modules/ui-tinymce/LICENSE
rename to src/vitis/vas/util/printserver/client/lib/angular/modules/ui-tinymce/LICENSE
diff --git a/vmap/vas/util/printserver/client/lib/angular/modules/ui-tinymce/tinymce.js b/src/vitis/vas/util/printserver/client/lib/angular/modules/ui-tinymce/tinymce.js
similarity index 100%
rename from vmap/vas/util/printserver/client/lib/angular/modules/ui-tinymce/tinymce.js
rename to src/vitis/vas/util/printserver/client/lib/angular/modules/ui-tinymce/tinymce.js
diff --git a/vmap/vas/util/printserver/client/lib/bootstrap/LICENSE b/src/vitis/vas/util/printserver/client/lib/bootstrap/LICENSE
similarity index 100%
rename from vmap/vas/util/printserver/client/lib/bootstrap/LICENSE
rename to src/vitis/vas/util/printserver/client/lib/bootstrap/LICENSE
diff --git a/vmap/vas/util/printserver/client/lib/bootstrap/css/bootstrap-theme.css b/src/vitis/vas/util/printserver/client/lib/bootstrap/css/bootstrap-theme.css
similarity index 100%
rename from vmap/vas/util/printserver/client/lib/bootstrap/css/bootstrap-theme.css
rename to src/vitis/vas/util/printserver/client/lib/bootstrap/css/bootstrap-theme.css
diff --git a/vmap/vas/util/printserver/client/lib/bootstrap/css/bootstrap-theme.css.map b/src/vitis/vas/util/printserver/client/lib/bootstrap/css/bootstrap-theme.css.map
similarity index 100%
rename from vmap/vas/util/printserver/client/lib/bootstrap/css/bootstrap-theme.css.map
rename to src/vitis/vas/util/printserver/client/lib/bootstrap/css/bootstrap-theme.css.map
diff --git a/vmap/vas/util/printserver/client/lib/bootstrap/css/bootstrap-theme.min.css b/src/vitis/vas/util/printserver/client/lib/bootstrap/css/bootstrap-theme.min.css
similarity index 100%
rename from vmap/vas/util/printserver/client/lib/bootstrap/css/bootstrap-theme.min.css
rename to src/vitis/vas/util/printserver/client/lib/bootstrap/css/bootstrap-theme.min.css
diff --git a/vmap/vas/util/printserver/client/lib/bootstrap/css/bootstrap-theme.min.css.map b/src/vitis/vas/util/printserver/client/lib/bootstrap/css/bootstrap-theme.min.css.map
similarity index 100%
rename from vmap/vas/util/printserver/client/lib/bootstrap/css/bootstrap-theme.min.css.map
rename to src/vitis/vas/util/printserver/client/lib/bootstrap/css/bootstrap-theme.min.css.map
diff --git a/vmap/vas/util/printserver/client/lib/bootstrap/css/bootstrap.css b/src/vitis/vas/util/printserver/client/lib/bootstrap/css/bootstrap.css
similarity index 100%
rename from vmap/vas/util/printserver/client/lib/bootstrap/css/bootstrap.css
rename to src/vitis/vas/util/printserver/client/lib/bootstrap/css/bootstrap.css
diff --git a/vmap/vas/util/printserver/client/lib/bootstrap/css/bootstrap.css.map b/src/vitis/vas/util/printserver/client/lib/bootstrap/css/bootstrap.css.map
similarity index 100%
rename from vmap/vas/util/printserver/client/lib/bootstrap/css/bootstrap.css.map
rename to src/vitis/vas/util/printserver/client/lib/bootstrap/css/bootstrap.css.map
diff --git a/vmap/vas/util/printserver/client/lib/bootstrap/css/bootstrap.min.css b/src/vitis/vas/util/printserver/client/lib/bootstrap/css/bootstrap.min.css
similarity index 100%
rename from vmap/vas/util/printserver/client/lib/bootstrap/css/bootstrap.min.css
rename to src/vitis/vas/util/printserver/client/lib/bootstrap/css/bootstrap.min.css
diff --git a/vmap/vas/util/printserver/client/lib/bootstrap/css/bootstrap.min.css.map b/src/vitis/vas/util/printserver/client/lib/bootstrap/css/bootstrap.min.css.map
similarity index 100%
rename from vmap/vas/util/printserver/client/lib/bootstrap/css/bootstrap.min.css.map
rename to src/vitis/vas/util/printserver/client/lib/bootstrap/css/bootstrap.min.css.map
diff --git a/vmap/vas/util/printserver/client/lib/bootstrap/fonts/glyphicons-halflings-regular.eot b/src/vitis/vas/util/printserver/client/lib/bootstrap/fonts/glyphicons-halflings-regular.eot
similarity index 100%
rename from vmap/vas/util/printserver/client/lib/bootstrap/fonts/glyphicons-halflings-regular.eot
rename to src/vitis/vas/util/printserver/client/lib/bootstrap/fonts/glyphicons-halflings-regular.eot
diff --git a/vmap/vas/util/printserver/client/lib/bootstrap/fonts/glyphicons-halflings-regular.svg b/src/vitis/vas/util/printserver/client/lib/bootstrap/fonts/glyphicons-halflings-regular.svg
similarity index 100%
rename from vmap/vas/util/printserver/client/lib/bootstrap/fonts/glyphicons-halflings-regular.svg
rename to src/vitis/vas/util/printserver/client/lib/bootstrap/fonts/glyphicons-halflings-regular.svg
diff --git a/vmap/vas/util/printserver/client/lib/bootstrap/fonts/glyphicons-halflings-regular.ttf b/src/vitis/vas/util/printserver/client/lib/bootstrap/fonts/glyphicons-halflings-regular.ttf
similarity index 100%
rename from vmap/vas/util/printserver/client/lib/bootstrap/fonts/glyphicons-halflings-regular.ttf
rename to src/vitis/vas/util/printserver/client/lib/bootstrap/fonts/glyphicons-halflings-regular.ttf
diff --git a/vmap/vas/util/printserver/client/lib/bootstrap/fonts/glyphicons-halflings-regular.woff b/src/vitis/vas/util/printserver/client/lib/bootstrap/fonts/glyphicons-halflings-regular.woff
similarity index 100%
rename from vmap/vas/util/printserver/client/lib/bootstrap/fonts/glyphicons-halflings-regular.woff
rename to src/vitis/vas/util/printserver/client/lib/bootstrap/fonts/glyphicons-halflings-regular.woff
diff --git a/vmap/vas/util/printserver/client/lib/bootstrap/fonts/glyphicons-halflings-regular.woff2 b/src/vitis/vas/util/printserver/client/lib/bootstrap/fonts/glyphicons-halflings-regular.woff2
similarity index 100%
rename from vmap/vas/util/printserver/client/lib/bootstrap/fonts/glyphicons-halflings-regular.woff2
rename to src/vitis/vas/util/printserver/client/lib/bootstrap/fonts/glyphicons-halflings-regular.woff2
diff --git a/vmap/vas/util/printserver/client/lib/bootstrap/js/bootstrap.js b/src/vitis/vas/util/printserver/client/lib/bootstrap/js/bootstrap.js
similarity index 100%
rename from vmap/vas/util/printserver/client/lib/bootstrap/js/bootstrap.js
rename to src/vitis/vas/util/printserver/client/lib/bootstrap/js/bootstrap.js
diff --git a/vmap/vas/util/printserver/client/lib/bootstrap/js/bootstrap.min.js b/src/vitis/vas/util/printserver/client/lib/bootstrap/js/bootstrap.min.js
similarity index 100%
rename from vmap/vas/util/printserver/client/lib/bootstrap/js/bootstrap.min.js
rename to src/vitis/vas/util/printserver/client/lib/bootstrap/js/bootstrap.min.js
diff --git a/vmap/vas/util/printserver/client/lib/bootstrap/js/npm.js b/src/vitis/vas/util/printserver/client/lib/bootstrap/js/npm.js
similarity index 100%
rename from vmap/vas/util/printserver/client/lib/bootstrap/js/npm.js
rename to src/vitis/vas/util/printserver/client/lib/bootstrap/js/npm.js
diff --git a/vmap/vas/util/printserver/client/lib/closure/goog/base.js b/src/vitis/vas/util/printserver/client/lib/closure/goog/base.js
similarity index 100%
rename from vmap/vas/util/printserver/client/lib/closure/goog/base.js
rename to src/vitis/vas/util/printserver/client/lib/closure/goog/base.js
diff --git a/vmap/vas/util/printserver/client/lib/jquery/LICENSE.txt b/src/vitis/vas/util/printserver/client/lib/jquery/LICENSE.txt
similarity index 100%
rename from vmap/vas/util/printserver/client/lib/jquery/LICENSE.txt
rename to src/vitis/vas/util/printserver/client/lib/jquery/LICENSE.txt
diff --git a/vmap/vas/util/printserver/client/lib/jquery/jquery-1.11.3.js b/src/vitis/vas/util/printserver/client/lib/jquery/jquery-1.11.3.js
similarity index 100%
rename from vmap/vas/util/printserver/client/lib/jquery/jquery-1.11.3.js
rename to src/vitis/vas/util/printserver/client/lib/jquery/jquery-1.11.3.js
diff --git a/vmap/vas/util/printserver/client/lib/jquery/jquery-1.11.3.min.js b/src/vitis/vas/util/printserver/client/lib/jquery/jquery-1.11.3.min.js
similarity index 100%
rename from vmap/vas/util/printserver/client/lib/jquery/jquery-1.11.3.min.js
rename to src/vitis/vas/util/printserver/client/lib/jquery/jquery-1.11.3.min.js
diff --git a/vmap/vas/util/printserver/client/lib/jquery/jquery-1.11.3.min.map b/src/vitis/vas/util/printserver/client/lib/jquery/jquery-1.11.3.min.map
similarity index 100%
rename from vmap/vas/util/printserver/client/lib/jquery/jquery-1.11.3.min.map
rename to src/vitis/vas/util/printserver/client/lib/jquery/jquery-1.11.3.min.map
diff --git a/vmap/vas/util/printserver/client/lib/mapJSON/MapJSON.js b/src/vitis/vas/util/printserver/client/lib/mapJSON/MapJSON.js
similarity index 100%
rename from vmap/vas/util/printserver/client/lib/mapJSON/MapJSON.js
rename to src/vitis/vas/util/printserver/client/lib/mapJSON/MapJSON.js
diff --git a/vmap/vas/util/printserver/client/lib/ol/ol-debug.js b/src/vitis/vas/util/printserver/client/lib/ol/ol-debug.js
similarity index 100%
rename from vmap/vas/util/printserver/client/lib/ol/ol-debug.js
rename to src/vitis/vas/util/printserver/client/lib/ol/ol-debug.js
diff --git a/vmap/vas/util/printserver/client/lib/ol/ol.css b/src/vitis/vas/util/printserver/client/lib/ol/ol.css
similarity index 100%
rename from vmap/vas/util/printserver/client/lib/ol/ol.css
rename to src/vitis/vas/util/printserver/client/lib/ol/ol.css
diff --git a/vmap/vas/util/printserver/client/lib/ol/ol.js b/src/vitis/vas/util/printserver/client/lib/ol/ol.js
similarity index 100%
rename from vmap/vas/util/printserver/client/lib/ol/ol.js
rename to src/vitis/vas/util/printserver/client/lib/ol/ol.js
diff --git a/vmap/vas/util/printserver/client/lib/ol/ol3-ext/licence.txt b/src/vitis/vas/util/printserver/client/lib/ol/ol3-ext/licence.txt
similarity index 100%
rename from vmap/vas/util/printserver/client/lib/ol/ol3-ext/licence.txt
rename to src/vitis/vas/util/printserver/client/lib/ol/ol3-ext/licence.txt
diff --git a/vmap/vas/util/printserver/client/lib/ol/ol3-ext/readme.txt b/src/vitis/vas/util/printserver/client/lib/ol/ol3-ext/readme.txt
similarity index 100%
rename from vmap/vas/util/printserver/client/lib/ol/ol3-ext/readme.txt
rename to src/vitis/vas/util/printserver/client/lib/ol/ol3-ext/readme.txt
diff --git a/vmap/vas/util/printserver/client/lib/ol/ol3-ext/style/fonts/fontawesome.def.js b/src/vitis/vas/util/printserver/client/lib/ol/ol3-ext/style/fonts/fontawesome.def.js
similarity index 100%
rename from vmap/vas/util/printserver/client/lib/ol/ol3-ext/style/fonts/fontawesome.def.js
rename to src/vitis/vas/util/printserver/client/lib/ol/ol3-ext/style/fonts/fontawesome.def.js
diff --git a/vmap/vas/util/printserver/client/lib/ol/ol3-ext/style/fontsymbol.js b/src/vitis/vas/util/printserver/client/lib/ol/ol3-ext/style/fontsymbol.js
similarity index 100%
rename from vmap/vas/util/printserver/client/lib/ol/ol3-ext/style/fontsymbol.js
rename to src/vitis/vas/util/printserver/client/lib/ol/ol3-ext/style/fontsymbol.js
diff --git a/vmap/vas/util/printserver/client/lib/ol/ol3-ext/style/shadowstyle.js b/src/vitis/vas/util/printserver/client/lib/ol/ol3-ext/style/shadowstyle.js
similarity index 100%
rename from vmap/vas/util/printserver/client/lib/ol/ol3-ext/style/shadowstyle.js
rename to src/vitis/vas/util/printserver/client/lib/ol/ol3-ext/style/shadowstyle.js
diff --git a/vmap/vas/util/printserver/client/lib/ol/ol3-ext/utils/ol.ordering.js b/src/vitis/vas/util/printserver/client/lib/ol/ol3-ext/utils/ol.ordering.js
similarity index 100%
rename from vmap/vas/util/printserver/client/lib/ol/ol3-ext/utils/ol.ordering.js
rename to src/vitis/vas/util/printserver/client/lib/ol/ol3-ext/utils/ol.ordering.js
diff --git a/vmap/vas/util/printserver/client/lib/ol/ol3-veremes/ol.veremes.js b/src/vitis/vas/util/printserver/client/lib/ol/ol3-veremes/ol.veremes.js
similarity index 100%
rename from vmap/vas/util/printserver/client/lib/ol/ol3-veremes/ol.veremes.js
rename to src/vitis/vas/util/printserver/client/lib/ol/ol3-veremes/ol.veremes.js
diff --git a/vmap/vas/util/printserver/client/map/index.html b/src/vitis/vas/util/printserver/client/map/index.html
similarity index 100%
rename from vmap/vas/util/printserver/client/map/index.html
rename to src/vitis/vas/util/printserver/client/map/index.html
diff --git a/vmap/vas/util/printserver/client/map/index.js b/src/vitis/vas/util/printserver/client/map/index.js
similarity index 100%
rename from vmap/vas/util/printserver/client/map/index.js
rename to src/vitis/vas/util/printserver/client/map/index.js
diff --git a/vmap/vas/util/printserver/client/map/map.js b/src/vitis/vas/util/printserver/client/map/map.js
similarity index 100%
rename from vmap/vas/util/printserver/client/map/map.js
rename to src/vitis/vas/util/printserver/client/map/map.js
diff --git a/vmap/vas/util/printserver/client/map/progress.js b/src/vitis/vas/util/printserver/client/map/progress.js
similarity index 100%
rename from vmap/vas/util/printserver/client/map/progress.js
rename to src/vitis/vas/util/printserver/client/map/progress.js
diff --git a/vmap/vas/util/printserver/client/map/projections.js b/src/vitis/vas/util/printserver/client/map/projections.js
similarity index 100%
rename from vmap/vas/util/printserver/client/map/projections.js
rename to src/vitis/vas/util/printserver/client/map/projections.js
diff --git a/vmap/vas/util/printserver/client/map/scale.js b/src/vitis/vas/util/printserver/client/map/scale.js
similarity index 100%
rename from vmap/vas/util/printserver/client/map/scale.js
rename to src/vitis/vas/util/printserver/client/map/scale.js
diff --git a/vmap/vas/util/printserver/client/report/index.html b/src/vitis/vas/util/printserver/client/report/index.html
similarity index 100%
rename from vmap/vas/util/printserver/client/report/index.html
rename to src/vitis/vas/util/printserver/client/report/index.html
diff --git a/vmap/vas/util/printserver/client/report/index.js b/src/vitis/vas/util/printserver/client/report/index.js
similarity index 100%
rename from vmap/vas/util/printserver/client/report/index.js
rename to src/vitis/vas/util/printserver/client/report/index.js
diff --git a/vmap/vas/util/printserver/client/report/report.js b/src/vitis/vas/util/printserver/client/report/report.js
similarity index 100%
rename from vmap/vas/util/printserver/client/report/report.js
rename to src/vitis/vas/util/printserver/client/report/report.js
diff --git a/vmap/vas/util/printserver/client/template/index.html b/src/vitis/vas/util/printserver/client/template/index.html
similarity index 100%
rename from vmap/vas/util/printserver/client/template/index.html
rename to src/vitis/vas/util/printserver/client/template/index.html
diff --git a/vmap/vas/util/printserver/client/template/index.js b/src/vitis/vas/util/printserver/client/template/index.js
similarity index 100%
rename from vmap/vas/util/printserver/client/template/index.js
rename to src/vitis/vas/util/printserver/client/template/index.js
diff --git a/vmap/vas/util/printserver/client/template/template.js b/src/vitis/vas/util/printserver/client/template/template.js
similarity index 100%
rename from vmap/vas/util/printserver/client/template/template.js
rename to src/vitis/vas/util/printserver/client/template/template.js
diff --git a/vmap/vas/util/printserver/client/utils/http.js b/src/vitis/vas/util/printserver/client/utils/http.js
similarity index 100%
rename from vmap/vas/util/printserver/client/utils/http.js
rename to src/vitis/vas/util/printserver/client/utils/http.js
diff --git a/vmap/vas/util/printserver/client/utils/properties.js b/src/vitis/vas/util/printserver/client/utils/properties.js
similarity index 100%
rename from vmap/vas/util/printserver/client/utils/properties.js
rename to src/vitis/vas/util/printserver/client/utils/properties.js
diff --git a/vmap/vas/util/printserver/client/utils/utils.js b/src/vitis/vas/util/printserver/client/utils/utils.js
similarity index 100%
rename from vmap/vas/util/printserver/client/utils/utils.js
rename to src/vitis/vas/util/printserver/client/utils/utils.js
diff --git a/vmap/vas/util/printserver/server/printmap.js b/src/vitis/vas/util/printserver/server/printmap.js
similarity index 100%
rename from vmap/vas/util/printserver/server/printmap.js
rename to src/vitis/vas/util/printserver/server/printmap.js
diff --git a/vmap/vas/util/printserver/server/printreport.js b/src/vitis/vas/util/printserver/server/printreport.js
similarity index 100%
rename from vmap/vas/util/printserver/server/printreport.js
rename to src/vitis/vas/util/printserver/server/printreport.js
diff --git a/vmap/vas/util/printserver/server/printtemplate.js b/src/vitis/vas/util/printserver/server/printtemplate.js
similarity index 100%
rename from vmap/vas/util/printserver/server/printtemplate.js
rename to src/vitis/vas/util/printserver/server/printtemplate.js
diff --git a/vmap/vas/util/printserver/server/saveimage.js b/src/vitis/vas/util/printserver/server/saveimage.js
similarity index 100%
rename from vmap/vas/util/printserver/server/saveimage.js
rename to src/vitis/vas/util/printserver/server/saveimage.js
diff --git a/vmap/vas/util/printserver/server/targetsize.js b/src/vitis/vas/util/printserver/server/targetsize.js
similarity index 100%
rename from vmap/vas/util/printserver/server/targetsize.js
rename to src/vitis/vas/util/printserver/server/targetsize.js
diff --git a/vmap/vas/util/proxy/proxy.php b/src/vitis/vas/util/proxy/proxy.php
similarity index 100%
rename from vmap/vas/util/proxy/proxy.php
rename to src/vitis/vas/util/proxy/proxy.php
diff --git a/vmap/vas/util/webSocket/server/lib/SplClassLoader.php b/src/vitis/vas/util/webSocket/server/lib/SplClassLoader.php
similarity index 100%
rename from vmap/vas/util/webSocket/server/lib/SplClassLoader.php
rename to src/vitis/vas/util/webSocket/server/lib/SplClassLoader.php
diff --git a/vmap/vas/util/webSocket/server/lib/WebSocket/Application/Application.php b/src/vitis/vas/util/webSocket/server/lib/WebSocket/Application/Application.php
similarity index 100%
rename from vmap/vas/util/webSocket/server/lib/WebSocket/Application/Application.php
rename to src/vitis/vas/util/webSocket/server/lib/WebSocket/Application/Application.php
diff --git a/vmap/vas/util/webSocket/server/lib/WebSocket/Application/DemoApplication.php b/src/vitis/vas/util/webSocket/server/lib/WebSocket/Application/DemoApplication.php
similarity index 100%
rename from vmap/vas/util/webSocket/server/lib/WebSocket/Application/DemoApplication.php
rename to src/vitis/vas/util/webSocket/server/lib/WebSocket/Application/DemoApplication.php
diff --git a/vmap/vas/util/webSocket/server/lib/WebSocket/Application/GtfEvents.php b/src/vitis/vas/util/webSocket/server/lib/WebSocket/Application/GtfEvents.php
similarity index 100%
rename from vmap/vas/util/webSocket/server/lib/WebSocket/Application/GtfEvents.php
rename to src/vitis/vas/util/webSocket/server/lib/WebSocket/Application/GtfEvents.php
diff --git a/vmap/vas/util/webSocket/server/lib/WebSocket/Application/Status.php b/src/vitis/vas/util/webSocket/server/lib/WebSocket/Application/Status.php
similarity index 100%
rename from vmap/vas/util/webSocket/server/lib/WebSocket/Application/Status.php
rename to src/vitis/vas/util/webSocket/server/lib/WebSocket/Application/Status.php
diff --git a/vmap/vas/util/webSocket/server/lib/WebSocket/Application/StatusApplication.php b/src/vitis/vas/util/webSocket/server/lib/WebSocket/Application/StatusApplication.php
similarity index 100%
rename from vmap/vas/util/webSocket/server/lib/WebSocket/Application/StatusApplication.php
rename to src/vitis/vas/util/webSocket/server/lib/WebSocket/Application/StatusApplication.php
diff --git a/vmap/vas/util/webSocket/server/lib/WebSocket/Application/VitisApplication.php b/src/vitis/vas/util/webSocket/server/lib/WebSocket/Application/VitisApplication.php
similarity index 100%
rename from vmap/vas/util/webSocket/server/lib/WebSocket/Application/VitisApplication.php
rename to src/vitis/vas/util/webSocket/server/lib/WebSocket/Application/VitisApplication.php
diff --git a/vmap/vas/util/webSocket/server/lib/WebSocket/Application/VmapEvents.php b/src/vitis/vas/util/webSocket/server/lib/WebSocket/Application/VmapEvents.php
similarity index 100%
rename from vmap/vas/util/webSocket/server/lib/WebSocket/Application/VmapEvents.php
rename to src/vitis/vas/util/webSocket/server/lib/WebSocket/Application/VmapEvents.php
diff --git a/vmap/vas/util/webSocket/server/lib/WebSocket/Connection.php b/src/vitis/vas/util/webSocket/server/lib/WebSocket/Connection.php
similarity index 100%
rename from vmap/vas/util/webSocket/server/lib/WebSocket/Connection.php
rename to src/vitis/vas/util/webSocket/server/lib/WebSocket/Connection.php
diff --git a/vmap/vas/util/webSocket/server/lib/WebSocket/Server.php b/src/vitis/vas/util/webSocket/server/lib/WebSocket/Server.php
similarity index 100%
rename from vmap/vas/util/webSocket/server/lib/WebSocket/Server.php
rename to src/vitis/vas/util/webSocket/server/lib/WebSocket/Server.php
diff --git a/vmap/vas/util/webSocket/server/lib/WebSocket/Socket.php b/src/vitis/vas/util/webSocket/server/lib/WebSocket/Socket.php
similarity index 100%
rename from vmap/vas/util/webSocket/server/lib/WebSocket/Socket.php
rename to src/vitis/vas/util/webSocket/server/lib/WebSocket/Socket.php
diff --git a/vmap/vas/util/webSocket/server/server.pem b/src/vitis/vas/util/webSocket/server/server.pem
similarity index 100%
rename from vmap/vas/util/webSocket/server/server.pem
rename to src/vitis/vas/util/webSocket/server/server.pem
diff --git a/vmap/vas/util/webSocket/server/server.php b/src/vitis/vas/util/webSocket/server/server.php
similarity index 100%
rename from vmap/vas/util/webSocket/server/server.php
rename to src/vitis/vas/util/webSocket/server/server.php
diff --git a/vmap/vas/util/writerpick.txt b/src/vitis/vas/util/writerpick.txt
similarity index 100%
rename from vmap/vas/util/writerpick.txt
rename to src/vitis/vas/util/writerpick.txt
diff --git a/update_vmap.sh b/update_vmap.sh
deleted file mode 100755
index c7bb82fcbdb1367bfb5b1941f4d019e4d6c63b8d..0000000000000000000000000000000000000000
--- a/update_vmap.sh
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/bash
-#
-#
-# 	Script de mise à jour du dépot front vMap versionné sous git
-#
-#   Split repo
-#   git subtree split -P module/ -b module_split_branch
-#
-#   Add subtree
-#   git subtree add --prefix vmap "git@vm09.veremes.net:Development/vitis_apps/sources/Vitis.git" master
-#
-#
-
-
-APP_NAME="vmap"
-APP_MODULES=( vmap vm4ms anc cadastre cadastreV2 )
-
-rm -Rf repos
-
-# Vitis
-echo "---- INIT Vitis ----"
-git subtree pull --prefix ${APP_NAME} "git@vm09.veremes.net:Development/vitis_apps/sources/Vitis.git" master
-
-# Conf
-echo "---- INIT $APP_NAME conf ----"
-git subtree pull --prefix ${APP_NAME}/client/conf "git@vm09.veremes.net:Development/vitis_apps/sources/app_${APP_NAME}.git" master
-
-# Modules
-for module in "${APP_MODULES[@]}"; do
-	echo "---- INIT ${module} ----"
-
-    # Ajoute le dépôt
-    git clone "git@vm09.veremes.net:Development/vitis_apps/sources/module_${module}.git" repos/module_${module}
-    if [ -d "$(pwd)/repos/module_${module}/" ]; then
-
-        # Crée les branches contenant uniquement les dossiers cibles
-        cd repos/module_${module}/
-        if [ -d "$(pwd)/module/" ]; then
-            git subtree split -P module/ -b module_split
-        fi
-        if [ -d "$(pwd)/web_service/conf/" ]; then
-            git subtree split -P web_service/conf/ -b web_service_conf_split
-        fi
-        if [ -d "$(pwd)/web_service/sql/" ]; then
-            git subtree split -P web_service/sql/ -b web_service_sql_split
-        fi
-        if [ -d "$(pwd)/web_service/ws/" ]; then
-            git subtree split -P web_service/ws/ -b web_service_ws_split
-        fi
-        cd ../../
-
-        # Ajoute les subtrees
-        if [ -d "$(pwd)/repos/module_${module}/module/" ]; then
-            git subtree pull --prefix ${APP_NAME}/client/modules/${module} repos/module_${module}/.git module_split
-        fi
-        if [ -d "$(pwd)/repos/module_${module}/web_service/conf/" ]; then
-            git subtree pull --prefix ${APP_NAME}/vas/rest/conf/${module} repos/module_${module}/.git web_service_conf_split
-        fi
-        if [ -d "$(pwd)/repos/module_${module}/web_service/ws/" ]; then
-            git subtree pull --prefix ${APP_NAME}/vas/rest/ws/${module} repos/module_${module}/.git web_service_ws_split
-        fi
-        if [ -d "$(pwd)/repos/module_${module}/web_service/sql/" ]; then
-            git subtree pull --prefix ${APP_NAME}/vas/sql/${module} repos/module_${module}/.git web_service_sql_split
-        fi
-    fi
-done
diff --git a/utils/init_subtrees.sh b/utils/init_subtrees.sh
new file mode 100755
index 0000000000000000000000000000000000000000..61a58b0aae070c6d46615f25bdf8ad9d5db90a41
--- /dev/null
+++ b/utils/init_subtrees.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+#
+#
+# 	Script d'initialisation d'un dépot vMap versionné sous git
+#	Initislise l'ensemble des dépendances sous forme de subtrees
+#
+#
+#
+
+
+APP_NAME="vmap"
+APP_MODULES=( vmap vm4ms anc cadastre cadastreV2 )
+
+cd ..
+rm -Rf src
+mkdir src
+
+# Vitis
+echo "---- Init vitis ----"
+git subtree add --prefix src/vitis "git@vm09.veremes.net:Development/vitis_apps/sources/vitis.git" master
+
+# Modules
+for module in "${APP_MODULES[@]}"; do
+	echo "---- Init module_${module} ----"
+
+    # Ajoute le dépôt
+	git subtree add --prefix src/module_${module} "git@vm09.veremes.net:Development/vitis_apps/sources/module_${module}.git" master
+done
diff --git a/utils/init_symlinks.sh b/utils/init_symlinks.sh
new file mode 100755
index 0000000000000000000000000000000000000000..a55f1f0e9752adf4dca19b70353e26ac235be5e2
--- /dev/null
+++ b/utils/init_symlinks.sh
@@ -0,0 +1,52 @@
+#!/bin/bash
+#
+#
+# 	Script d'initialisation d'un dépot vMap versionné sous git
+#
+#   Split repo
+#   git subtree split -P module/ -b module_split_branch
+#
+#   Add subtree
+#   git subtree add --prefix vmap "git@vm09.veremes.net:Development/vitis_apps/sources/Vitis.git" master
+#
+#
+
+
+APP_NAME="vmap"
+APP_MODULES=( vmap vm4ms anc cadastre cadastreV2 )
+
+cd ..
+
+# Vitis
+echo "---- Link vitis ----"
+ln -rsf src/vitis/client client
+ln -rsf src/vitis/vas vas
+
+# Conf
+echo "---- Link ${APP_NAME}/conf ----"
+ln -rsf conf src/vitis/client/conf
+
+# Modules
+for module in "${APP_MODULES[@]}"; do
+	echo "---- Link module_${module} ----"
+	if [ -d "$(pwd)/src/module_${module}/module" ]; then
+		ln -rsf src/module_${module}/module src/vitis/client/modules/${module}
+	fi
+	if [ -d "$(pwd)/src/module_${module}/web_service/ws" ]; then
+		ln -rsf src/module_${module}/web_service/ws src/vitis/vas/rest/ws/${module}
+	fi
+	if [ -d "$(pwd)/src/module_${module}/web_service/conf" ]; then
+		ln -rsf src/module_${module}/web_service/conf src/vitis/vas/rest/conf/${module}
+	fi
+	if [ -d "$(pwd)/src/module_${module}/web_service/sql" ]; then
+		ln -rsf src/module_${module}/web_service/conf src/vitis/vas/sql/${module}
+	fi
+	if [ -d "$(pwd)/src/module_${module}/web_service/class" ]; then
+		for class_dir in $( ls "$(pwd)/src/module_${module}/web_service/class"); do
+			if [ -d "$(pwd)/src/module_${module}/web_service/class/${class_dir}" ]; then
+				echo "---- Link module_${module}/${class_dir} ----"
+				ln -rsf src/module_${module}/web_service/class/${class_dir} src/vitis/vas/rest/class/${class_dir}
+			fi
+		done
+	fi
+done
diff --git a/utils/pull_subtrees.sh b/utils/pull_subtrees.sh
new file mode 100755
index 0000000000000000000000000000000000000000..1158e63bccc4184a9d49e8f3d2452d7256fd5e1f
--- /dev/null
+++ b/utils/pull_subtrees.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+#
+#
+# 	Script d'initialisation d'un dépot vMap versionné sous git
+#	Initislise l'ensemble des dépendances sous forme de subtrees
+#
+#
+#
+
+
+APP_NAME="vmap"
+APP_MODULES=( vmap vm4ms anc cadastre cadastreV2 )
+
+cd ..
+
+# Vitis
+echo "---- Pull vitis ----"
+git subtree pull --prefix src/vitis "git@vm09.veremes.net:Development/vitis_apps/sources/vitis.git" master
+
+# Modules
+for module in "${APP_MODULES[@]}"; do
+	echo "---- Pull module_${module} ----"
+
+    # Ajoute le dépôt
+	git subtree pull --prefix src/module_${module} "git@vm09.veremes.net:Development/vitis_apps/sources/module_${module}.git" master
+done
diff --git a/utils/push_subtrees.sh b/utils/push_subtrees.sh
new file mode 100755
index 0000000000000000000000000000000000000000..665ed8fdde44e60a721e9fe77277d347ad44caef
--- /dev/null
+++ b/utils/push_subtrees.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+#
+#
+# 	Script d'initialisation d'un dépot vMap versionné sous git
+#	Initislise l'ensemble des dépendances sous forme de subtrees
+#
+#
+#
+
+
+APP_NAME="vmap"
+APP_MODULES=( vmap vm4ms anc cadastre cadastreV2 )
+
+cd ..
+
+# Vitis
+echo "---- Push vitis ----"
+git subtree push --prefix src/vitis "git@vm09.veremes.net:Development/vitis_apps/sources/vitis.git" master
+
+# Modules
+for module in "${APP_MODULES[@]}"; do
+	echo "---- Push module_${module} ----"
+
+    # Ajoute le dépôt
+	git subtree push --prefix src/module_${module} "git@vm09.veremes.net:Development/vitis_apps/sources/module_${module}.git" master
+done
diff --git a/vmap/.gitignore b/vmap/.gitignore
deleted file mode 100644
index 0cff9dfdd802c79f89b8b99cea6bfed490f2174d..0000000000000000000000000000000000000000
--- a/vmap/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-conf
-client/modules/*
-vas/rest/conf/*
-vas/rest/ws/*
-vas/sql/*
diff --git a/vmap/client/conf/README.md b/vmap/client/conf/README.md
deleted file mode 100644
index 7a7e67a73bdef7e98e4ef51cb7c8b002fddfbbfe..0000000000000000000000000000000000000000
--- a/vmap/client/conf/README.md
+++ /dev/null
@@ -1 +0,0 @@
-Application vMap
\ No newline at end of file