diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 80a0dfd..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,22 +0,0 @@
-[submodule "SSOwat"]
-	path = SSOwat
-	url = https://github.com/Kloadut/SSOwat
-    branch = unstable
-[submodule "yunohost-admin"]
-	path = yunohost-admin
-	url = https://github.com/YunoHost/yunohost-admin.git
-    branch = unstable
-[submodule "yunohost"]
-	path = yunohost
-	url = https://github.com/YunoHost/yunohost
-    branch = unstable
-[submodule "moulinette"]
-	path = moulinette
-	url = https://github.com/YunoHost/moulinette
-    branch = unstable
-[submodule "Dockerfile"]
-	path = Dockerfile
-	url = https://github.com/YunoHost/Dockerfile
-[submodule "yunohost-vagrant"]
-	path = yunohost-vagrant
-	url = https://github.com/zamentur/yunohost-vagrant
diff --git a/Dockerfile b/Dockerfile
deleted file mode 160000
index e598efa..0000000
--- a/Dockerfile
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e598efab1daa882867c97de805840b0f331dc971
diff --git a/SSOwat b/SSOwat
deleted file mode 160000
index 1e9087b..0000000
--- a/SSOwat
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1e9087b644b44f48a5601e2acadbd16e3bfa338b
diff --git a/moulinette b/moulinette
deleted file mode 160000
index 3d589b5..0000000
--- a/moulinette
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 3d589b59d7138689ba3c7dbe0b2c4115be7444d5
diff --git a/ynh-dev b/ynh-dev
index 94f863b..da5f62e 100755
--- a/ynh-dev
+++ b/ynh-dev
@@ -3,6 +3,10 @@
 usage() {
     print "
 Usage :
+On the host
+  `basename $0` create-env PATH
+  `basename $0` run DOMAIN [VM VERSION]
+Inside the vm
   `basename $0` setup
   `basename $0` deploy [PAQUET [PAQUET ...]]
   `basename $0` watch [PAQUET [PAQUET ...]]
@@ -12,9 +16,29 @@ PAQUET :
     ssowat
     yunohost
     yunohost-admin
+    
+VM
+    docker
+    virtualbox
+    
+VERSION
+    stable8
+    testing8
+    unstable8
+    stable7
+    testing7
+    unstable7
 "
 }
 
+check_yunohost_vm() {
+    if [ ! -d /etc/yunohost ]
+    then
+        echo "You need to install YunoHost first. Maybe you are not in a vm ?"
+        exit 100;
+    fi
+}
+
 paquets=${@:2}
 if [ "$#" = "1" ]; then
     paquets=moulinette ssowat yunohost yunohost-admin
@@ -22,17 +46,39 @@ fi
 
 BASE_DIR=/yunohost
 
-if [ ! -d /etc/yunohost ]
-then
-    echo "You need to install YunoHost first. Maybe you are not in a vm ?"
-    exit 100;
-fi
-
 if [ "$1" = "-h" ] || [ "$1" = "--help" ] || [ "$1" = "help" ]; then
     usage
+elif [ "$1" = "create-env" ]; then
+    pwd=`pwd`
+    cd $2
+    mkdir -p apps
+    mkdir -p backup
+    git clone -b unstable https://github.com/Kloadut/SSOwat SSOwat
+    git clone -b unstable https://github.com/YunoHost/yunohost-admin yunohost-admin
+    git clone -b unstable https://github.com/YunoHost/yunohost yunohost
+    git clone -b unstable https://github.com/YunoHost/moulinette moulinette
+    git clone https://github.com/YunoHost/Dockerfile Dockerfile
+    git clone https://github.com/zamentur/yunohost-vagrant yunohost-vagrant
+    cp $pwd/$0 ./$0
+elif [ "$1" = "run" ]; then
+    DOMAIN=$2
+    VM=$3
+    VERSION=$4
+    
+    if [ "$VM" = "docker" ]; then
+        docker exec -t -i $(sudo docker run -h yunohost.$DOMAIN -v $(pwd):/yunohost -d zamentur/yunohost-$VERSION /sbin/init) /bin/bash
+    elif [ "$VM" = "virtualbox" ]; then
+        vagrant up $VERSION
+        vagrant ssh $VERSION
+    else
+        echo "This kind of VM is not supported"
+        exit 100;
+    fi
 elif [ "$1" = "setup" ]; then
+    check_yunohost_vm
     sudo apt-get install -y inotify-tools
 elif [ "$1" = "deploy" ]; then
+    check_yunohost_vm
     for paquet in $paquets; do
         case $paquet in
             moulinette)
@@ -58,7 +104,7 @@ elif [ "$1" = "deploy" ]; then
           esac
     done
 elif [ "$1" = "watch" ]; then
-
+    check_yunohost_vm
     while inotifywait -r -e close_write $BASE_DIR/moulinette/ $BASE_DIR/ssowat/ $BASE_DIR/yunohost/ $BASE_DIR/yunohost-admin/; do 
         $BASE_DIR/$0 deploy ${@:2}; 
     done
diff --git a/yunohost b/yunohost
deleted file mode 160000
index 1beadf3..0000000
--- a/yunohost
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1beadf3051ae190fd859ad234000dc24c97b565b
diff --git a/yunohost-admin b/yunohost-admin
deleted file mode 160000
index 0bb8fe6..0000000
--- a/yunohost-admin
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0bb8fe6e4da0a1ef02e32aed350c1fa2cfed1301
diff --git a/yunohost-vagrant b/yunohost-vagrant
deleted file mode 160000
index 7d4e8df..0000000
--- a/yunohost-vagrant
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7d4e8dfacbc4befeafe4c3aa686ecb74a9d7f8ac