diff --git a/.gitignore b/.gitignore
index d8b5d9919508b3efbd1b1fdc1d91adb22b53876d..663498ae55617a86968c651a746f7f08425a9924 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,17 +1,20 @@
-client
-vas
+# client
+# vas
 conf/closure
 conf/node_modules/
 conf/properties.json
 src/closure/conf/depswriter/
-src/vitis/vas/log/
-src/vitis/vas/public/
-src/vitis/vas/server/
-src/vitis/vas/ws_data/
-src/vitis/vas/tmp/
-src/vitis/client/modules/
-! src/vitis/client/modules/vitis/
-src/vitis/vas/rest/ws/*
-! src/vitis/vas/rest/ws/vitis/
-src/vitis/vas/sql/*
-! src/vitis/vas/sql/sqlQueries.xml
+src/vitis/client/javascript/*.js*
+
+vas/log/
+vas/public/
+vas/server/
+vas/ws_data/
+vas/tmp/
+vas/shared/
+# src/vitis/client/modules/
+# ! src/vitis/client/modules/vitis/
+# src/vitis/vas/rest/ws/*
+# ! src/vitis/vas/rest/ws/vitis/
+# src/vitis/vas/sql/*
+# ! src/vitis/vas/sql/sqlQueries.xml
diff --git a/utils/init_symlinks.sh b/utils/init_symlinks.sh
index c98ed30e162c2d81c8b90e5b6755bb5602941b5e..1eaf4969acd404d328068dcae1c05edb1da55052 100755
--- a/utils/init_symlinks.sh
+++ b/utils/init_symlinks.sh
@@ -19,14 +19,36 @@ read APP_EXISTING_PATH
 
 cd ..
 
+# Supprime les anciens symlinks
+if [ -e "client" ]; then
+	rm client
+fi
+if [ -e "vas" ]; then
+	rm vas
+fi
+find src/vitis/client -type l -delete
+find src/vitis/vas/sql -type l -delete
+find src/vitis/vas/rest -type l -delete
+
 # Vitis
 echo "---- Link vitis ----"
 if ! [ -e "$(pwd)/client" ]; then
-	echo "---- Link vitis 2 ----"
 	ln -rsf src/vitis/client client
 fi
 if ! [ -e "$(pwd)/vas" ]; then
-	ln -rsf src/vitis/vas vas
+# 	ln -rsf src/vitis/vas vas
+
+	mkdir vas
+	mkdir vas/rest
+	mkdir vas/rest/conf
+	ln -rsf src/vitis/vas/doc vas/doc
+	ln -rsf src/vitis/vas/rest/class vas/rest/class
+	ln -rsf src/vitis/vas/rest/inc vas/rest/inc
+	ln -rsf src/vitis/vas/rest/ws vas/rest/ws
+	ln -rsf src/vitis/vas/rest/index.phtml vas/rest/index.phtml
+	ln -rsf src/vitis/vas/rest/index.vhtml vas/rest/index.vhtml
+	ln -rsf src/vitis/vas/sql vas/sql
+	ln -rsf src/vitis/vas/util vas/util
 fi
 
 # Conf
@@ -55,11 +77,11 @@ if [[ $depsCount > 0 ]]; then
 						ln -rsf src/module_${module}/web_service/ws src/vitis/vas/rest/ws/${module}
 					fi
 				fi
-				if [ -d "$(pwd)/src/module_${module}/web_service/conf" ]; then
-					if ! [ -e "src/vitis/vas/rest/conf/${module}" ]; then
-						ln -rsf src/module_${module}/web_service/conf src/vitis/vas/rest/conf/${module}
-					fi
-				fi
+				# if [ -d "$(pwd)/src/module_${module}/web_service/conf" ]; then
+				# 	if ! [ -e "src/vitis/vas/rest/conf/${module}" ]; then
+				# 		ln -rsf src/module_${module}/web_service/conf src/vitis/vas/rest/conf/${module}
+				# 	fi
+				# fi
 				if [ -d "$(pwd)/src/module_${module}/web_service/sql" ]; then
 					if ! [ -e "src/vitis/vas/sql/${module}" ]; then
 						ln -rsf src/module_${module}/web_service/sql src/vitis/vas/sql/${module}