diff --git a/README.md b/README.md
index aef4b3c855d92a898e93993ca5f4fcffb95d2d33..e369c84dcefec912db513dcb7bda70d249c86d35 100644
--- a/README.md
+++ b/README.md
@@ -9,6 +9,7 @@ Usage
 
 * Install Docker on your machine
 * Install Git and run `git clone https://github.com/xwiki-contrib/docker-xwiki.git` or download the content of https://github.com/xwiki-contrib/docker-xwiki
+* Go to the `xwiki-mysql-tomcat` directory: `cd xwiki-mysql-tomcat`
 * Run `docker-compose up`
 
 Details
diff --git a/.env b/xwiki-mysql-tomcat/.env
similarity index 100%
rename from .env
rename to xwiki-mysql-tomcat/.env
diff --git a/Dockerfile b/xwiki-mysql-tomcat/Dockerfile
similarity index 100%
rename from Dockerfile
rename to xwiki-mysql-tomcat/Dockerfile
diff --git a/docker-compose.yml b/xwiki-mysql-tomcat/docker-compose.yml
similarity index 100%
rename from docker-compose.yml
rename to xwiki-mysql-tomcat/docker-compose.yml
diff --git a/mysql/xwiki.cnf b/xwiki-mysql-tomcat/mysql/xwiki.cnf
similarity index 100%
rename from mysql/xwiki.cnf
rename to xwiki-mysql-tomcat/mysql/xwiki.cnf
diff --git a/tomcat/setenv.sh b/xwiki-mysql-tomcat/tomcat/setenv.sh
similarity index 100%
rename from tomcat/setenv.sh
rename to xwiki-mysql-tomcat/tomcat/setenv.sh
diff --git a/xwiki/hibernate.cfg.xml b/xwiki-mysql-tomcat/xwiki/hibernate.cfg.xml
similarity index 100%
rename from xwiki/hibernate.cfg.xml
rename to xwiki-mysql-tomcat/xwiki/hibernate.cfg.xml
diff --git a/xwiki/start_xwiki.sh b/xwiki-mysql-tomcat/xwiki/start_xwiki.sh
similarity index 100%
rename from xwiki/start_xwiki.sh
rename to xwiki-mysql-tomcat/xwiki/start_xwiki.sh
diff --git a/xwiki/xwiki-config-replace.sh b/xwiki-mysql-tomcat/xwiki/xwiki-config-replace.sh
similarity index 100%
rename from xwiki/xwiki-config-replace.sh
rename to xwiki-mysql-tomcat/xwiki/xwiki-config-replace.sh
diff --git a/xwiki/xwiki-set-cfg b/xwiki-mysql-tomcat/xwiki/xwiki-set-cfg
similarity index 100%
rename from xwiki/xwiki-set-cfg
rename to xwiki-mysql-tomcat/xwiki/xwiki-set-cfg
diff --git a/xwiki/xwiki-set-properties b/xwiki-mysql-tomcat/xwiki/xwiki-set-properties
similarity index 100%
rename from xwiki/xwiki-set-properties
rename to xwiki-mysql-tomcat/xwiki/xwiki-set-properties