diff --git a/.gitignore b/.gitignore
index 663498ae55617a86968c651a746f7f08425a9924..9d50ce6960dc645602f546791790a35f6d75356e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,14 +4,19 @@ conf/closure
 conf/node_modules/
 conf/properties.json
 src/closure/conf/depswriter/
-src/vitis/client/javascript/*.js*
+# src/vitis/client/javascript/*.js*
+
+vas/
+client/
+
+# vas/log/
+# vas/public/
+# vas/server/
+# vas/ws_data/
+# vas/tmp/
+# vas/shared/
+# vas/upload/
 
-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/*
diff --git a/utils/init_symlinks.sh b/utils/init_symlinks.sh
index 1eaf4969acd404d328068dcae1c05edb1da55052..529bea1ab3749c57ada0a1949cb45e3184b67d01 100755
--- a/utils/init_symlinks.sh
+++ b/utils/init_symlinks.sh
@@ -26,6 +26,12 @@ fi
 if [ -e "vas" ]; then
 	rm vas
 fi
+if [ -d "client" ]; then
+	rm -Rf client
+fi
+if [ -d "vas" ]; then
+	rm -Rf 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
@@ -33,7 +39,23 @@ find src/vitis/vas/rest -type l -delete
 # Vitis
 echo "---- Link vitis ----"
 if ! [ -e "$(pwd)/client" ]; then
-	ln -rsf src/vitis/client client
+	# ln -rsf src/vitis/client client
+
+	mkdir client
+	mkdir client/javascript
+	mkdir client/modules
+	ln -rsf src/vitis/client/css client/css
+	ln -rsf src/vitis/client/forms client/forms
+	ln -rsf src/vitis/client/images client/images
+	ln -rsf src/vitis/client/javascript/app client/javascript/app
+	ln -rsf src/vitis/client/javascript/externs client/javascript/externs
+	ln -rsf src/vitis/client/javascript/require client/javascript/require
+	ln -rsf src/vitis/client/lang client/lang
+	ln -rsf src/vitis/client/less client/less
+	ln -rsf src/vitis/client/modules/vitis client/modules/vitis
+	ln -rsf src/vitis/client/templates client/templates
+	ln -rsf src/vitis/client/.htaccess client/.htaccess
+	ln -rsf src/vitis/client/index.html client/index.html
 fi
 if ! [ -e "$(pwd)/vas" ]; then
 # 	ln -rsf src/vitis/vas vas
@@ -54,7 +76,7 @@ fi
 # Conf
 echo "---- Link conf ----"
 if ! [ -e "src/vitis/client/conf" ]; then
-	ln -rsf conf src/vitis/client/conf
+	ln -rsf conf client/conf
 fi
 if ! [ -e "conf/closure" ]; then
 	ln -rsf src/closure/conf conf/closure