diff --git a/client/_install/fileToDelete.txt b/_install/client/fileToDelete.txt
old mode 100755
new mode 100644
similarity index 98%
rename from client/_install/fileToDelete.txt
rename to _install/client/fileToDelete.txt
index 32b675a4cd503eba44b601374639ace5707f964b..ca3a9114882b45d4b55b25a40380235fc553ceb9
--- a/client/_install/fileToDelete.txt
+++ b/_install/client/fileToDelete.txt
@@ -1,4 +1,4 @@
-javascript/externs/formreader/formreader.js
-javascript/externs/formreader/formreaderCtrl.js
-javascript/externs/formreader/formreaderDrtv.js
+javascript/externs/formreader/formreader.js
+javascript/externs/formreader/formreaderCtrl.js
+javascript/externs/formreader/formreaderDrtv.js
javascript/externs/formreader/formreaderSrvc.js
\ No newline at end of file
diff --git a/client/_install/folderToDelete.txt b/_install/client/folderToDelete.txt
old mode 100755
new mode 100644
similarity index 96%
rename from client/_install/folderToDelete.txt
rename to _install/client/folderToDelete.txt
index c0f1c982de1a6344c1a9539f92c875eae05119a8..a0e7984dc0bc0ee6987ebffa481549c126c7ef9b
--- a/client/_install/folderToDelete.txt
+++ b/_install/client/folderToDelete.txt
@@ -1,8 +1,8 @@
-javascript/app
-javascript/require
-javascript/test
-javascript/externs/openLayers/ol
-javascript/externs/openLayers/ol.ext
-javascript/externs/studio/properties
-javascript/externs/studio/javascript
+javascript/app
+javascript/require
+javascript/test
+javascript/externs/openLayers/ol
+javascript/externs/openLayers/ol.ext
+javascript/externs/studio/properties
+javascript/externs/studio/javascript
modules/vitis/javascript
\ No newline at end of file
diff --git a/client/_install/listModuleApache.txt b/_install/client/listModuleApache.txt
old mode 100755
new mode 100644
similarity index 89%
rename from client/_install/listModuleApache.txt
rename to _install/client/listModuleApache.txt
index 90a6e6931161be7bd63ad8a51c01886125bcfb6b..2c0309e320b509b2ba74dc5f3ddd6a211245e922
--- a/client/_install/listModuleApache.txt
+++ b/_install/client/listModuleApache.txt
@@ -1,5 +1,5 @@
-alias
-deflate
-headers
-rewrite
+alias
+deflate
+headers
+rewrite
ssl
\ No newline at end of file
diff --git a/vas/_install/dependencies/mapserver/.htaccess b/_install/dependencies/mapserver/.htaccess
similarity index 100%
rename from vas/_install/dependencies/mapserver/.htaccess
rename to _install/dependencies/mapserver/.htaccess
diff --git a/vas/_install/dependencies/mapserver/linux/apache.conf b/_install/dependencies/mapserver/linux/apache.conf
similarity index 100%
rename from vas/_install/dependencies/mapserver/linux/apache.conf
rename to _install/dependencies/mapserver/linux/apache.conf
diff --git a/vas/_install/dependencies/mapserver/windows/apache.conf b/_install/dependencies/mapserver/windows/apache.conf
similarity index 100%
rename from vas/_install/dependencies/mapserver/windows/apache.conf
rename to _install/dependencies/mapserver/windows/apache.conf
diff --git a/vas/_install/dependencies/php/linux/apache.conf b/_install/dependencies/php/linux/apache.conf
similarity index 100%
rename from vas/_install/dependencies/php/linux/apache.conf
rename to _install/dependencies/php/linux/apache.conf
diff --git a/vas/_install/dependencies/php/php.ini b/_install/dependencies/php/php.ini
similarity index 100%
rename from vas/_install/dependencies/php/php.ini
rename to _install/dependencies/php/php.ini
diff --git a/vas/_install/dependencies/php/windows/apache.conf b/_install/dependencies/php/windows/apache.conf
similarity index 100%
rename from vas/_install/dependencies/php/windows/apache.conf
rename to _install/dependencies/php/windows/apache.conf
diff --git a/vas/_install/dependencies/pycron/crontab.txt b/_install/dependencies/pycron/crontab.txt
similarity index 100%
rename from vas/_install/dependencies/pycron/crontab.txt
rename to _install/dependencies/pycron/crontab.txt
diff --git a/vas/_install/dependencies/websocket/apache.conf b/_install/dependencies/websocket/apache.conf
similarity index 100%
rename from vas/_install/dependencies/websocket/apache.conf
rename to _install/dependencies/websocket/apache.conf
diff --git a/vas/_install/dependencies/websocket/linux/websocket_vitis b/_install/dependencies/websocket/linux/websocket_vitis
similarity index 100%
rename from vas/_install/dependencies/websocket/linux/websocket_vitis
rename to _install/dependencies/websocket/linux/websocket_vitis
diff --git a/vas/_install/dependencies/websocket/websocket.cfg b/_install/dependencies/websocket/websocket.cfg
similarity index 100%
rename from vas/_install/dependencies/websocket/websocket.cfg
rename to _install/dependencies/websocket/websocket.cfg
diff --git a/vas/_install/dependency.xml b/_install/dependency.xml
similarity index 92%
rename from vas/_install/dependency.xml
rename to _install/dependency.xml
index 7efd25915a6502da7eaad660780877ded794c91f..d24f9bfa74b3181222f9908611966ce519f2674a 100755
--- a/vas/_install/dependency.xml
+++ b/_install/dependency.xml
@@ -1,52 +1,51 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- VAS -->
-<installer>
- <schema>
- <name>s_vitis</name>
- <version>2018.05.00</version>
- <dependenciesCollection>
- <dependency>
- <name>postgres</name>
- <version>9.3</version>
- <nature>extern-pre</nature>
- </dependency>
- </dependenciesCollection>
- </schema>
- <dependenciesCollection>
- <dependency>
- <name>apache</name>
- <version>2.4.13</version>
- <nature>extern-pre</nature>
- </dependency>
- <dependency>
- <name>pre-install</name>
- <nature>extern-pre</nature>
- </dependency>
- <dependency>
- <name>php</name>
- <nature>extern-post</nature>
- <location>php-7.2.8</location>
- </dependency>
- <!-- Dépendances de PHP -->
- <dependency>
- <name>vcredist</name>
- <nature>extern-pre</nature>
- <location>vcredist-15-64</location>
- </dependency>
- <!-- Fin des dépendances de PHP -->
- <dependency>
- <name>post-install</name>
- <nature>extern-post</nature>
- </dependency>
- <dependency>
- <name>websocket</name>
- <nature>extern-post</nature>
- <location>websocket</location>
- </dependency>
- <dependency>
- <name>pgutils</name>
- <nature>extern-post</nature>
- <location>pgutils</location>
- </dependency>
- </dependenciesCollection>
-</installer>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Vitis -->
+<installer>
+ <schema>
+ <name>s_vitis</name>
+ <dependenciesCollection>
+ <dependency>
+ <name>postgres</name>
+ <version>9.3</version>
+ <nature>extern-pre</nature>
+ </dependency>
+ </dependenciesCollection>
+ </schema>
+ <dependenciesCollection>
+ <dependency>
+ <name>apache</name>
+ <version>2.4.13</version>
+ <nature>extern-pre</nature>
+ </dependency>
+ <dependency>
+ <name>pre-install</name>
+ <nature>extern-pre</nature>
+ </dependency>
+ <dependency>
+ <name>php</name>
+ <nature>extern-post</nature>
+ <location>php-7.2.8</location>
+ </dependency>
+ <!-- Dépendances de PHP -->
+ <dependency>
+ <name>vcredist</name>
+ <nature>extern-pre</nature>
+ <location>vcredist-15-64</location>
+ </dependency>
+ <!-- Fin des dépendances de PHP -->
+ <dependency>
+ <name>post-install</name>
+ <nature>extern-post</nature>
+ </dependency>
+ <dependency>
+ <name>websocket</name>
+ <nature>extern-post</nature>
+ <location>websocket</location>
+ </dependency>
+ <dependency>
+ <name>pgutils</name>
+ <nature>extern-post</nature>
+ <location>pgutils</location>
+ </dependency>
+ </dependenciesCollection>
+</installer>
diff --git a/vas/_install/apache.conf b/_install/vas/apache.conf
old mode 100755
new mode 100644
similarity index 96%
rename from vas/_install/apache.conf
rename to _install/vas/apache.conf
index bb66dfde1a4ca1e0463d8d83f8a26b29e70e9cd8..2281b2e2673c513df20924e94a224bfa45673fad
--- a/vas/_install/apache.conf
+++ b/_install/vas/apache.conf
@@ -1,70 +1,70 @@
-PassEnv TEMP
-Alias /rest[ENV] "[VASDIRECTORY]/rest"
- <Directory "[VASDIRECTORY]/rest">
- <FilesMatch ".+\.ph(p[345]?|t|tml)$">
- SetHandler application/x-httpd-php_vitis[ENV]
- </FilesMatch>
- AllowOverride FileInfo
- Options FollowSymLinks
- Require all granted
- <Files ~ "\.(map|log|inc|php)$">
- Order allow,deny
- Deny from all
- </Files>
- </Directory>
-
-Alias /doc[ENV] "[VASDIRECTORY]/doc"
- <Directory "[VASDIRECTORY]/doc">
- <FilesMatch ".+\.ph(p[345]?|t|tml)$">
- SetHandler application/x-httpd-php_vitis[ENV]
- </FilesMatch>
- AllowOverride FileInfo
- Options FollowSymLinks
- Require all granted
- </Directory>
-
-Alias /public[ENV] "[VASDIRECTORY]/public"
- <Directory "[VASDIRECTORY]/public">
- AllowOverride FileInfo
- Options FollowSymLinks
- Require all granted
- <Files ~ "\.(map|inc|php)$">
- Order allow,deny
- Deny from all
- </Files>
- SetHandler application/x-download
- </Directory>
-Alias /ws_data[ENV] "[VASDIRECTORY]/ws_data"
- <Directory "[VASDIRECTORY]/ws_data">
- AllowOverride All
- Options FollowSymLinks
- Require all granted
- <Files ~ "\.(map|log|inc|php)$">
- Order allow,deny
- Deny from all
- </Files>
- SetHandler application/x-download
- </Directory>
-Alias /proxy[ENV] "[VASDIRECTORY]/util/proxy"
- <Directory "[VASDIRECTORY]/util/proxy">
- <FilesMatch ".+\.ph(p[345]?|t|tml)$">
- SetHandler application/x-httpd-php_vitis[ENV]
- </FilesMatch>
- AllowOverride FileInfo
- Options FollowSymLinks
- Require all granted
- <Files ~ "\.(map|log|inc)$">
- Order allow,deny
- Deny from all
- </Files>
- </Directory>
-Alias /printserver[ENV] "[VASDIRECTORY]/util/printserver"
- <Directory "[VASDIRECTORY]/util/printserver">
- AllowOverride FileInfo
- Options FollowSymLinks
- Require all granted
- <Files ~ "\.(map|log|inc|php)$">
- Order allow,deny
- Deny from all
- </Files>
+PassEnv TEMP
+Alias /rest[ENV] "[VASDIRECTORY]/rest"
+ <Directory "[VASDIRECTORY]/rest">
+ <FilesMatch ".+\.ph(p[345]?|t|tml)$">
+ SetHandler application/x-httpd-php_vitis[ENV]
+ </FilesMatch>
+ AllowOverride FileInfo
+ Options FollowSymLinks
+ Require all granted
+ <Files ~ "\.(map|log|inc|php)$">
+ Order allow,deny
+ Deny from all
+ </Files>
+ </Directory>
+
+Alias /doc[ENV] "[VASDIRECTORY]/doc"
+ <Directory "[VASDIRECTORY]/doc">
+ <FilesMatch ".+\.ph(p[345]?|t|tml)$">
+ SetHandler application/x-httpd-php_vitis[ENV]
+ </FilesMatch>
+ AllowOverride FileInfo
+ Options FollowSymLinks
+ Require all granted
+ </Directory>
+
+Alias /public[ENV] "[VASDIRECTORY]/public"
+ <Directory "[VASDIRECTORY]/public">
+ AllowOverride FileInfo
+ Options FollowSymLinks
+ Require all granted
+ <Files ~ "\.(map|inc|php)$">
+ Order allow,deny
+ Deny from all
+ </Files>
+ SetHandler application/x-download
+ </Directory>
+Alias /ws_data[ENV] "[VASDIRECTORY]/ws_data"
+ <Directory "[VASDIRECTORY]/ws_data">
+ AllowOverride All
+ Options FollowSymLinks
+ Require all granted
+ <Files ~ "\.(map|log|inc|php)$">
+ Order allow,deny
+ Deny from all
+ </Files>
+ SetHandler application/x-download
+ </Directory>
+Alias /proxy[ENV] "[VASDIRECTORY]/util/proxy"
+ <Directory "[VASDIRECTORY]/util/proxy">
+ <FilesMatch ".+\.ph(p[345]?|t|tml)$">
+ SetHandler application/x-httpd-php_vitis[ENV]
+ </FilesMatch>
+ AllowOverride FileInfo
+ Options FollowSymLinks
+ Require all granted
+ <Files ~ "\.(map|log|inc)$">
+ Order allow,deny
+ Deny from all
+ </Files>
+ </Directory>
+Alias /printserver[ENV] "[VASDIRECTORY]/util/printserver"
+ <Directory "[VASDIRECTORY]/util/printserver">
+ AllowOverride FileInfo
+ Options FollowSymLinks
+ Require all granted
+ <Files ~ "\.(map|log|inc|php)$">
+ Order allow,deny
+ Deny from all
+ </Files>
</Directory>
\ No newline at end of file
diff --git a/vas/_install/listModuleApache.txt b/_install/vas/listModuleApache.txt
old mode 100755
new mode 100644
similarity index 80%
rename from vas/_install/listModuleApache.txt
rename to _install/vas/listModuleApache.txt
index 4e015bb242988a0dedb93b9dc81225400a47eddb..c2626d946f4a9bbaad4d7ca16423af23007c0ca3
--- a/vas/_install/listModuleApache.txt
+++ b/_install/vas/listModuleApache.txt
@@ -1,16 +1,16 @@
-actions
-alias
-cgi
-deflate
-headers
-ldap
-rewrite
-ssl
-proxy
-proxy_ajp
-proxy_connect
-proxy_fcgi
-proxy_ftp
-proxy_http
-proxy_scgi
-proxy_wstunnel
+actions
+alias
+cgi
+deflate
+headers
+ldap
+rewrite
+ssl
+proxy
+proxy_ajp
+proxy_connect
+proxy_fcgi
+proxy_ftp
+proxy_http
+proxy_scgi
+proxy_wstunnel
\ No newline at end of file
diff --git a/client/_install/dependency.xml b/client/_install/dependency.xml
deleted file mode 100755
index d550d0ab3dd930e418a485f8466e1ae16e52f874..0000000000000000000000000000000000000000
--- a/client/_install/dependency.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Core -->
-<installer>
- <dependenciesCollection>
- <dependency>
- <nature>vas</nature>
- <version>2018.05.00</version>
- </dependency>
- </dependenciesCollection>
-</installer>
diff --git a/client/index.html b/client/index.html
index 1040b14df6a2fd4880bebbba017bb9505b887680..81e34736e98e74ba6317298d8ae2314a968f9b0c 100755
--- a/client/index.html
+++ b/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>Vitis</title>
+ <title>Vitis 2018.05</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>