diff --git a/client/CHANGELOG.md b/client/CHANGELOG.md
new file mode 100644
index 0000000..7311efb
--- /dev/null
+++ b/client/CHANGELOG.md
@@ -0,0 +1,27 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+### Added
+
+### Changed
+
+* Use --dump-dir instead of --backup-dir to supress dump-server-state warning
+
+### Deprecated
+
+### Removed
+
+### Fixed
+
+* Make start_time and stop_time compatible with OpenBSD
+
+### Security
+
+## [22.03]
+
+Split client and server parts of the project
diff --git a/zzz_evobackup b/client/zzz_evobackup
similarity index 74%
rename from zzz_evobackup
rename to client/zzz_evobackup
index ee47aa6..92b34a9 100755
--- a/zzz_evobackup
+++ b/client/zzz_evobackup
@@ -20,6 +20,8 @@ set -u
 
 ##### Configuration ###################################################
 
+VERSION="22.03"
+
 # email adress for notifications
 MAIL=jdoe@example.com
 
@@ -38,18 +40,23 @@ LOCAL_BACKUP_DIR="/home/backup"
 # You can set "linux" or "bsd" manually or let it choose automatically
 SYSTEM=$(uname | tr '[:upper:]' '[:lower:]')
 
-# Store pid and logs in a file named after this program's name
-PROGNAME=$(basename $0)
+# Store pid in a file named after this program's name
+PROGNAME=$(basename "$0")
 PIDFILE="/var/run/${PROGNAME}.pid"
-LOGFILE="/var/log/${PROGNAME}.log"
+
+# Customize the log path if you have multiple scripts and with separate logs
+LOGFILE="/var/log/evobackup.log"
 
 # Enable/Disable tasks
 LOCAL_TASKS=${LOCAL_TASKS:-1}
 SYNC_TASKS=${SYNC_TASKS:-1}
 
+HOSTNAME=$(hostname)
+
 ##### SETUP AND FUNCTIONS #############################################
 
-BEGINNING=$(/bin/date +"%d-%m-%Y ; %H:%M")
+START_EPOCH=$(/bin/date +%s)
+DATE_FORMAT="%Y-%m-%d %H:%M:%S"
 
 # shellcheck disable=SC2174
 mkdir -p -m 700 ${LOCAL_BACKUP_DIR}
@@ -84,6 +91,7 @@ test_server() {
     else
         # SSH connection failed
         new_error=$(printf "Failed to connect to \`%s' within %s seconds" "${item}" "${SSH_CONNECT_TIMEOUT}")
+        log "${new_error}"
         SERVERS_SSH_ERRORS=$(printf "%s\\n%s" "${SERVERS_SSH_ERRORS}" "${new_error}" | sed -e '/^$/d')
 
         return 1
@@ -97,17 +105,16 @@ pick_server() {
     if [ "${increment}" -ge "${list_length}" ]; then
         # We've reached the end of the list
         new_error="No more server available"
+        log "${new_error}"
         SERVERS_SSH_ERRORS=$(printf "%s\\n%s" "${SERVERS_SSH_ERRORS}" "${new_error}" | sed -e '/^$/d')
 
         # Log errors to stderr
         printf "%s\\n" "${SERVERS_SSH_ERRORS}" >&2
-        # Log errors to logfile
-        printf "%s\\n" "${SERVERS_SSH_ERRORS}" >> $LOGFILE
         return 1
     fi
 
     # Extract the day of month, without leading 0 (which would give an octal based number)
-    today=$(date +%e)
+    today=$(/bin/date +%e)
     # A salt is useful to randomize the starting point in the list
     # but stay identical each time it's called for a server (based on hostname).
     salt=$(hostname | cksum | cut -d' ' -f1)
@@ -119,6 +126,15 @@ pick_server() {
 
     echo "${SERVERS}" | cut -d' ' -f${field}
 }
+log() {
+    msg="${1:-$(cat /dev/stdin)}"
+    pid=$$
+    printf "[%s] %s[%s]: %s\\n" \
+        "$(/bin/date +"${DATE_FORMAT}")" "${PROGNAME}" "${pid}" "${msg}" \
+        >> "${LOGFILE}"
+}
+
+log "START GLOBAL - VERSION=${VERSION} LOCAL_TASKS=${LOCAL_TASKS} SYNC_TASKS=${SYNC_TASKS}"
 
 ## Verify other evobackup process and kill if needed
 if [ -e "${PIDFILE}" ]; then
@@ -133,16 +149,18 @@ if [ -e "${PIDFILE}" ]; then
         kill -9 "${pid}"
         printf "%s is still running (PID %s). Process has been killed" "$0" "${pid}\\n" >&2
     else
-        rm -f ${PIDFILE}
+        rm -f "${PIDFILE}"
     fi
 fi
-echo "$$" > ${PIDFILE}
+echo "$$" > "${PIDFILE}"
 # shellcheck disable=SC2064
 trap "rm -f ${PIDFILE}" EXIT
 
 ##### LOCAL BACKUP ####################################################
 
 if [ "${LOCAL_TASKS}" = "1" ]; then
+    log "START LOCAL_TASKS"
+
     # You can comment or uncomment sections below to customize the backup
 
     ## OpenLDAP : example with slapcat
@@ -173,6 +191,9 @@ if [ "${LOCAL_TASKS}" = "1" ]; then
     # mkdir -p -m 700 ${LOCAL_BACKUP_DIR}/mysql/
     # pt-show-grants --flush --no-header > ${LOCAL_BACKUP_DIR}/mysql/all_grants.sql
 
+    # Dump all variables
+    # mysql -A -e"SHOW GLOBAL VARIABLES;" > ${LOCAL_BACKUP_DIR}/MySQLCurrentSettings.txt
+
     ## example with SQL dump (schema only, no data) for each databases
     # mkdir -p -m 700 ${LOCAL_BACKUP_DIR}/mysql/
     # for i in $(mysql --defaults-extra-file=/etc/mysql/debian.cnf -P 3306 -e 'show databases' -s --skip-column-names \
@@ -210,9 +231,9 @@ if [ "${LOCAL_TASKS}" = "1" ]; then
     ## PostgreSQL
 
     ## Purge previous dumps
-    # rm ${LOCAL_BACKUP_DIR}/pg.*.gz
-    # rm ${LOCAL_BACKUP_DIR}/pg-backup.tar
-    # rm ${LOCAL_BACKUP_DIR}/postgresql/*
+    # rm -rf ${LOCAL_BACKUP_DIR}/pg.*.gz
+    # rm -rf ${LOCAL_BACKUP_DIR}/pg-backup.tar
+    # rm -rf ${LOCAL_BACKUP_DIR}/postgresql/*
     ## example with pg_dumpall (warning: you need space in ~postgres)
     # su - postgres -c "pg_dumpall > ~/pg.dump.bak"
     # mv ~postgres/pg.dump.bak ${LOCAL_BACKUP_DIR}/
@@ -283,7 +304,7 @@ if [ "${LOCAL_TASKS}" = "1" ]; then
     # for snapshot in $(curl -s -XGET "localhost:9200/_snapshot/snaprepo/_all?pretty=true" | grep -Eo 'snapshot_[0-9]{4}-[0-9]{2}-[0-9]{2}' | head -n -10); do
     #     curl -s -XDELETE "localhost:9200/_snapshot/snaprepo/${snapshot}" | grep -v -Fx '{"acknowledged":true}'
     # done
-    # date=$(date +%F)
+    # date=$(/bin/date +%F)
     # curl -s -XPUT "localhost:9200/_snapshot/snaprepo/snapshot_${date}?wait_for_completion=true" -o /tmp/es_snapshot_${date}.log
 
     ## RabbitMQ
@@ -295,104 +316,126 @@ if [ "${LOCAL_TASKS}" = "1" ]; then
 
     #megacli -CfgSave -f ${LOCAL_BACKUP_DIR}/megacli_conf.dump -a0 >/dev/null
 
-    ## Dump system and kernel versions
-    uname -a > ${LOCAL_BACKUP_DIR}/uname
-
     ## Dump network routes with mtr and traceroute (warning: could be long with aggressive firewalls)
     for addr in 8.8.8.8 www.evolix.fr travaux.evolix.net; do
         mtr -r ${addr} > ${LOCAL_BACKUP_DIR}/mtr-${addr}
         traceroute -n ${addr} > ${LOCAL_BACKUP_DIR}/traceroute-${addr} 2>&1
     done
 
-    ## Dump process with ps
-    ps auwwx >${LOCAL_BACKUP_DIR}/ps.out
+    server_state_dir="${LOCAL_BACKUP_DIR}/server-state"
+
+    dump_server_state_bin=$(command -v dump-server-state)
 
     if [ "${SYSTEM}" = "linux" ]; then
-        ## Dump network connections with ss
-        ss -taupen > ${LOCAL_BACKUP_DIR}/netstat.out
+        if [ -n "${dump_server_state_bin}" ]; then
+            ${dump_server_state_bin} --all --force --dump-dir "${server_state_dir}"
+        else
+            mkdir -p "${server_state_dir}"
 
-        ## List Debian packages
-        dpkg -l > ${LOCAL_BACKUP_DIR}/packages
-        dpkg --get-selections > ${LOCAL_BACKUP_DIR}/packages.getselections
-        apt-cache dumpavail > ${LOCAL_BACKUP_DIR}/packages.available
+            ## Dump system and kernel versions
+            uname -a > ${server_state_dir}/uname.txt
 
-        ## Dump MBR / table partitions
-        disks=$(lsblk -l | grep disk | grep -v -E '(drbd|fd[0-9]+)' | awk '{print $1}')
-        for disk in ${disks}; do
-            dd if="/dev/${disk}" of="${LOCAL_BACKUP_DIR}/MBR-${disk}" bs=512 count=1 2>&1 | grep -Ev "(records in|records out|512 bytes)"
-            fdisk -l "/dev/${disk}" > "${LOCAL_BACKUP_DIR}/partitions-${disk}" 2>&1
-        done
-        cat ${LOCAL_BACKUP_DIR}/partitions-* > ${LOCAL_BACKUP_DIR}/partitions
+            ## Dump process with ps
+            ps auwwx > ${server_state_dir}/ps.txt
 
-        ## Dump iptables
-        if [ -x /sbin/iptables ]; then
-            { /sbin/iptables -L -n -v; /sbin/iptables -t filter -L -n -v; } > ${LOCAL_BACKUP_DIR}/iptables.txt
-        fi
+            ## Dump network connections with ss
+            ss -taupen > ${server_state_dir}/netstat.txt
 
-        ## Dump findmnt(8) output
-        FINDMNT_BIN=$(command -v findmnt)
-        if [ -x "${FINDMNT_BIN}" ]; then
-            ${FINDMNT_BIN} > ${LOCAL_BACKUP_DIR}/findmnt.txt
+            ## List Debian packages
+            dpkg -l > ${server_state_dir}/packages
+            dpkg --get-selections > ${server_state_dir}/packages.getselections
+            apt-cache dumpavail > ${server_state_dir}/packages.available
+
+            ## Dump iptables
+            if [ -x /sbin/iptables ]; then
+                { /sbin/iptables -L -n -v; /sbin/iptables -t filter -L -n -v; } > ${server_state_dir}/iptables.txt
+            fi
+
+            ## Dump findmnt(8) output
+            FINDMNT_BIN=$(command -v findmnt)
+            if [ -x "${FINDMNT_BIN}" ]; then
+                ${FINDMNT_BIN} > ${server_state_dir}/findmnt.txt
+            fi
+
+            ## Dump MBR / table partitions
+            disks=$(lsblk -l | grep disk | grep -v -E '(drbd|fd[0-9]+)' | awk '{print $1}')
+            for disk in ${disks}; do
+                dd if="/dev/${disk}" of="${server_state_dir}/MBR-${disk}" bs=512 count=1 2>&1 | grep -Ev "(records in|records out|512 bytes)"
+                fdisk -l "/dev/${disk}" > "${server_state_dir}/partitions-${disk}" 2>&1
+            done
+            cat ${server_state_dir}/partitions-* > ${server_state_dir}/partitions
         fi
     else
-        ## Dump network connections with fstat
-        fstat | head -1 > ${LOCAL_BACKUP_DIR}/netstat.out
-        fstat | grep internet >> ${LOCAL_BACKUP_DIR}/netstat.out
+        if [ -n "${dump_server_state_bin}" ]; then
+            ${dump_server_state_bin} --all --force --backup-dir "${server_state_dir}"
+        else
+            mkdir -p "${server_state_dir}"
 
-        ## List OpenBSD packages
-        pkg_info -m > ${LOCAL_BACKUP_DIR}/packages
+            ## Dump system and kernel versions
+            uname -a > ${server_state_dir}/uname
 
-        ## Dump MBR / table partitions
-        disklabel sd0 > ${LOCAL_BACKUP_DIR}/partitions
+            ## Dump process with ps
+            ps auwwx > ${server_state_dir}/ps.out
 
-        ## Dump pf infos
-        pfctl -sa > ${LOCAL_BACKUP_DIR}/pfctl-sa.txt
+            ## Dump network connections with fstat
+            fstat | head -1 > ${server_state_dir}/netstat.out
+            fstat | grep internet >> ${server_state_dir}/netstat.out
 
+            ## List OpenBSD packages
+            pkg_info -m > ${server_state_dir}/packages
+
+            ## Dump MBR / table partitions
+            disklabel sd0 > ${server_state_dir}/partitions
+
+            ## Dump pf infos
+            pfctl -sa > ${server_state_dir}/pfctl-sa.txt
+        fi
     fi
 
     ## Dump rights
-    #getfacl -R /var > ${LOCAL_BACKUP_DIR}/rights-var.txt
-    #getfacl -R /etc > ${LOCAL_BACKUP_DIR}/rights-etc.txt
-    #getfacl -R /usr > ${LOCAL_BACKUP_DIR}/rights-usr.txt
-    #getfacl -R /home > ${LOCAL_BACKUP_DIR}/rights-home.txt
+    #getfacl -R /var  > ${server_state_dir}/rights-var.txt
+    #getfacl -R /etc  > ${server_state_dir}/rights-etc.txt
+    #getfacl -R /usr  > ${server_state_dir}/rights-usr.txt
+    #getfacl -R /home > ${server_state_dir}/rights-home.txt
 
+    log "STOP LOCAL_TASKS"
 fi
 
 ##### REMOTE BACKUP ###################################################
 
-n=0
-server=""
-if [ "${SERVERS_FALLBACK}" = "1" ]; then
-    # We try to find a suitable server
-    while :; do
-        server=$(pick_server "${n}")
-        test $? = 0 || exit 2
-
-        if test_server "${server}"; then
-            break
-        else
-            server=""
-            n=$(( n + 1 ))
-        fi
-    done
-else
-    # we force the server
-    server=$(pick_server "${n}")
-fi
-
-SSH_SERVER=$(echo "${server}" | cut -d':' -f1)
-SSH_PORT=$(echo "${server}" | cut -d':' -f2)
-
-HOSTNAME=$(hostname)
-
-if [ "${SYSTEM}" = "linux" ]; then
-    rep="/bin /boot /lib /opt /sbin /usr"
-else
-    rep="/bsd /bin /sbin /usr"
-fi
-
 
 if [ "${SYNC_TASKS}" = "1" ]; then
+    n=0
+    server=""
+    if [ "${SERVERS_FALLBACK}" = "1" ]; then
+        # We try to find a suitable server
+        while :; do
+            server=$(pick_server "${n}")
+            test $? = 0 || exit 2
+
+            if test_server "${server}"; then
+                break
+            else
+                server=""
+                n=$(( n + 1 ))
+            fi
+        done
+    else
+        # we force the server
+        server=$(pick_server "${n}")
+    fi
+
+    SSH_SERVER=$(echo "${server}" | cut -d':' -f1)
+    SSH_PORT=$(echo "${server}" | cut -d':' -f2)
+
+    if [ "${SYSTEM}" = "linux" ]; then
+        rep="/bin /boot /lib /opt /sbin /usr"
+    else
+        rep="/bsd /bin /sbin /usr"
+    fi
+
+    log "START SYNC_TASKS - server=${server}"
+
     # /!\ DO NOT USE COMMENTS in the rsync command /!\
     # It breaks the command and destroys data, simply remove (or add) lines.
 
@@ -425,13 +468,13 @@ if [ "${SYNC_TASKS}" = "1" ]; then
         --exclude "/var/lib/postgresql"                    \
         --exclude "/var/lib/sympa"                         \
         --exclude "/var/lock"                              \
-        --exclude "/var/log"                               \
-        --exclude "/var/log/evobackup*"                    \
         --exclude "/var/run"                               \
         --exclude "/var/spool/postfix"                     \
         --exclude "/var/spool/smtpd"                       \
         --exclude "/var/spool/squid"                       \
         --exclude "/var/state"                             \
+        --exclude "/var/tmp"                               \
+        --exclude "lxc/*/rootfs/tmp"                       \
         --exclude "lxc/*/rootfs/usr/doc"                   \
         --exclude "lxc/*/rootfs/usr/obj"                   \
         --exclude "lxc/*/rootfs/usr/share/doc"             \
@@ -444,6 +487,7 @@ if [ "${SYNC_TASKS}" = "1" ]; then
         --exclude "lxc/*/rootfs/var/log"                   \
         --exclude "lxc/*/rootfs/var/run"                   \
         --exclude "lxc/*/rootfs/var/state"                 \
+        --exclude "lxc/*/rootfs/var/tmp"                   \
         --exclude "/home/mysqltmp"                         \
             ${rep}                                         \
             /etc                                           \
@@ -453,20 +497,24 @@ if [ "${SYNC_TASKS}" = "1" ]; then
         -e "${RSH_COMMAND}"                                \
         "root@${SSH_SERVER}:/var/backup/"                  \
         | tail -30 >> $LOGFILE
+
+    log "STOP SYNC_TASKS - server=${server}"
 fi
 
 ##### REPORTING #######################################################
 
-END=$(/bin/date +"%d-%m-%Y ; %H:%M")
+STOP_EPOCH=$(/bin/date +%s)
 
-printf "EvoBackup - %s - START %s ON %s (LOCAL_TASKS=%s SYNC_TASKS=%s)\\n" \
-       "${HOSTNAME}" "${BEGINNING}" "${SSH_SERVER}" "${LOCAL_TASKS}" "${SYNC_TASKS}" \
-       >> $LOGFILE
+if [ "${SYSTEM}" = "openbsd" ]; then
+    start_time=$(/bin/date -f "%s" -j "${START_EPOCH}" +"${DATE_FORMAT}")
+    stop_time=$(/bin/date -f "%s" -j "${STOP_EPOCH}" +"${DATE_FORMAT}")
+else
+    start_time=$(/bin/date --date="@${START_EPOCH}" +"${DATE_FORMAT}")
+    stop_time=$(/bin/date --date="@${STOP_EPOCH}" +"${DATE_FORMAT}")
+fi
+duration=$(( STOP_EPOCH - START_EPOCH ))
 
-printf "EvoBackup - %s - STOP %s ON %s (LOCAL_TASKS=%s SYNC_TASKS=%s)\\n" \
-       "${HOSTNAME}" "${END}" "${SSH_SERVER}" "${LOCAL_TASKS}" "${SYNC_TASKS}" \
-       >> $LOGFILE
+log "STOP GLOBAL - start='${start_time}' stop='${stop_time}' duration=${duration}s"
 
-tail -10 $LOGFILE |                                    \
-    mail -s "[info] EvoBackup - Client ${HOSTNAME}"    \
-    ${MAIL}
+tail -20 "${LOGFILE}" \
+    | mail -s "[info] EvoBackup - Client ${HOSTNAME}" ${MAIL}
diff --git a/.gitignore b/server/.gitignore
similarity index 100%
rename from .gitignore
rename to server/.gitignore
diff --git a/CHANGELOG.md b/server/CHANGELOG.md
similarity index 94%
rename from CHANGELOG.md
rename to server/CHANGELOG.md
index 144f9c3..80f6568 100644
--- a/CHANGELOG.md
+++ b/server/CHANGELOG.md
@@ -6,10 +6,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-### Added
-
-### Changed
-
 ### Deprecated
 
 ### Removed
@@ -18,6 +14,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Security
 
+## [22.04] - 2022-04-20
+
+### Added
+
+* Run the test suite on Bullseye (ext4/btrfs) in addition of Stretch and Buster (ext4/btrfs)
+* Tell sed to follow symlinks
+* Add a header in `bkctld status` output and improved columns width.
+* bkctld-check-setup: compatibility with minifirewall 22.03+
+
+### Changed
+
+* change versioning pattern
+
 ## [2.12.0] - 2021-11-02
 
 ### Changed
diff --git a/LICENSE b/server/LICENSE
similarity index 100%
rename from LICENSE
rename to server/LICENSE
diff --git a/README.md b/server/README.md
similarity index 100%
rename from README.md
rename to server/README.md
diff --git a/Vagrantfile b/server/Vagrantfile
similarity index 92%
rename from Vagrantfile
rename to server/Vagrantfile
index 9791669..796fc2b 100644
--- a/Vagrantfile
+++ b/server/Vagrantfile
@@ -28,8 +28,8 @@ DEBIAN_FRONTEND=noninteractive apt-get -yq install openssh-server btrfs-progs rs
 SCRIPT
 
   $pre_part = <<SCRIPT
-sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
-    sed -i -e 's/# fr_FR.UTF-8 UTF-8/fr_FR.UTF-8 UTF-8/' /etc/locale.gen && \
+sed --follow-symlinks --in-place -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
+    sed --follow-symlinks --in-place -e 's/# fr_FR.UTF-8 UTF-8/fr_FR.UTF-8 UTF-8/' /etc/locale.gen && \
     echo 'LANG="fr_FR.UTF-8"'>/etc/default/locale && \
     dpkg-reconfigure --frontend=noninteractive locales && \
     update-locale LANG=fr_FR.UTF-8
diff --git a/bash_completion b/server/bash_completion
similarity index 100%
rename from bash_completion
rename to server/bash_completion
diff --git a/bkctld b/server/bkctld
similarity index 97%
rename from bkctld
rename to server/bkctld
index 05ba7a7..03535d3 100755
--- a/bkctld
+++ b/server/bkctld
@@ -116,6 +116,7 @@ case "${subcommand}" in
     ;;
     "status")
         jail_name="${2:-}"
+        printf '%-30s %-10s %-10s %-25s %-20s\n' 'JAIL NAME' 'STATUS' 'PORT' 'RETENTION (DAY/MONTH)' 'IP'
         if [ "${jail_name}" = "all" ] || [ -z "${jail_name}" ]; then
             for jail in $("${LIBDIR}/bkctld-list"); do
                 "${LIBDIR}/bkctld-${subcommand}" "${jail}"
diff --git a/bkctld.8 b/server/bkctld.8
similarity index 100%
rename from bkctld.8
rename to server/bkctld.8
diff --git a/bkctld.conf b/server/bkctld.conf
similarity index 100%
rename from bkctld.conf
rename to server/bkctld.conf
diff --git a/bkctld.conf.5 b/server/bkctld.conf.5
similarity index 100%
rename from bkctld.conf.5
rename to server/bkctld.conf.5
diff --git a/bkctld.service b/server/bkctld.service
similarity index 100%
rename from bkctld.service
rename to server/bkctld.service
diff --git a/docs/configuration.md b/server/docs/configuration.md
similarity index 100%
rename from docs/configuration.md
rename to server/docs/configuration.md
diff --git a/docs/debian.md b/server/docs/debian.md
similarity index 89%
rename from docs/debian.md
rename to server/docs/debian.md
index e99b0cf..2bb9843 100644
--- a/docs/debian.md
+++ b/server/docs/debian.md
@@ -49,3 +49,6 @@ Launch git-buildpackage :
 ~~~
 gbp buildpackage
 ~~~
+
+The generated build files (including the `.deb`) are located in the `/tmp/bkctld/` directory.
+
diff --git a/docs/incrementals.md b/server/docs/incrementals.md
similarity index 100%
rename from docs/incrementals.md
rename to server/docs/incrementals.md
diff --git a/docs/install.md b/server/docs/install.md
similarity index 95%
rename from docs/install.md
rename to server/docs/install.md
index bfb6d7d..5760174 100644
--- a/docs/install.md
+++ b/server/docs/install.md
@@ -5,7 +5,7 @@
 A Debian package is available in the Evolix repository
 
 ~~~
-echo "http://pub.evolix.net/jessie/" >> /etc/apt/sources.list
+echo "deb http://pub.evolix.net/ stretch" >> /etc/apt/sources.list
 apt update
 apt install bkctld
 ~~~
diff --git a/docs/usage.md b/server/docs/usage.md
similarity index 100%
rename from docs/usage.md
rename to server/docs/usage.md
diff --git a/evobackup-incl.5 b/server/evobackup-incl.5
similarity index 100%
rename from evobackup-incl.5
rename to server/evobackup-incl.5
diff --git a/lib/bkctld-archive b/server/lib/bkctld-archive
similarity index 100%
rename from lib/bkctld-archive
rename to server/lib/bkctld-archive
diff --git a/lib/bkctld-check-incs b/server/lib/bkctld-check-incs
similarity index 97%
rename from lib/bkctld-check-incs
rename to server/lib/bkctld-check-incs
index 14093fe..6feb794 100755
--- a/lib/bkctld-check-incs
+++ b/server/lib/bkctld-check-incs
@@ -26,6 +26,9 @@ for jail_name in $("${LIBDIR}/bkctld-list"); do
 
         # read each line in jail configuration
         while read line; do
+            ## TODO
+            # deal with empty lines
+
             # inc date in ISO format
             inc_iso=$(relative_date "${line}")
             # inc date in seconds from epoch
diff --git a/lib/bkctld-check-jails b/server/lib/bkctld-check-jails
similarity index 100%
rename from lib/bkctld-check-jails
rename to server/lib/bkctld-check-jails
diff --git a/lib/bkctld-check-last-incs b/server/lib/bkctld-check-last-incs
similarity index 100%
rename from lib/bkctld-check-last-incs
rename to server/lib/bkctld-check-last-incs
diff --git a/lib/bkctld-check-setup b/server/lib/bkctld-check-setup
similarity index 74%
rename from lib/bkctld-check-setup
rename to server/lib/bkctld-check-setup
index d2632a0..95a020b 100755
--- a/lib/bkctld-check-setup
+++ b/server/lib/bkctld-check-setup
@@ -29,17 +29,24 @@ fi
 # Check if the firewall file is sourced
 
 minifirewall_config=/etc/default/minifirewall
+minifirewall_version=$(/etc/init.d/minifirewall status | head -1 | cut -d ' ' -f 3)
 
 if [ -n "${FIREWALL_RULES}" ] \
 && [ -r "${FIREWALL_RULES}" ] \
 && [ -f "${minifirewall_config}" ]; then
-    if grep -qE "^(\.|source) ${FIREWALL_RULES}" "${minifirewall_config}"; then
+    if [ -n "${minifirewall_version}" ] && dpkg --compare-versions "${minifirewall_version}" ge "22.03"; then
+        # Minifirewall 22.03+ includes files automatically
         nb_ok=$((nb_ok + 1))
-        output="${output}OK - Firewall file \`${FIREWALL_RULES}' is sourced by \`${minifirewall_config}'.\n"
+        output="${output}OK - Firewall file \`${FIREWALL_RULES}' is present.\n"
     else
-        nb_warn=$((nb_warn + 1))
-        output="${output}WARNING - Firewall file \`${FIREWALL_RULES}' doesn't seem to be sourced by \`${minifirewall_config}'\n"
-        [ "${return}" -le 1 ] && return=1
+        if grep -qE "^(\.|source) ${FIREWALL_RULES}" "${minifirewall_config}"; then
+            nb_ok=$((nb_ok + 1))
+            output="${output}OK - Firewall file \`${FIREWALL_RULES}' is sourced by \`${minifirewall_config}'.\n"
+        else
+            nb_warn=$((nb_warn + 1))
+            output="${output}WARNING - Firewall file \`${FIREWALL_RULES}' doesn't seem to be sourced by \`${minifirewall_config}'\n"
+            [ "${return}" -le 1 ] && return=1
+        fi
     fi
 fi
 
diff --git a/lib/bkctld-firewall b/server/lib/bkctld-firewall
similarity index 91%
rename from lib/bkctld-firewall
rename to server/lib/bkctld-firewall
index 7cb434c..a7eeecf 100755
--- a/lib/bkctld-firewall
+++ b/server/lib/bkctld-firewall
@@ -25,7 +25,7 @@ iptables_input_accept() {
 
 if [ -n "${FIREWALL_RULES}" ]; then
     # remove existing rules for this jail
-    [ -f "${FIREWALL_RULES}" ] && sed -i "/#${jail_name}$/d" "${FIREWALL_RULES}"
+    [ -f "${FIREWALL_RULES}" ] && sed --follow-symlinks --in-place "/#${jail_name}$/d" "${FIREWALL_RULES}"
     if [ -d "${jail_path}" ]; then
         port=$("${LIBDIR}/bkctld-port" "${jail_name}")
         # Add a rule for each IP
diff --git a/lib/bkctld-inc b/server/lib/bkctld-inc
similarity index 97%
rename from lib/bkctld-inc
rename to server/lib/bkctld-inc
index 049e5cf..58cc990 100755
--- a/lib/bkctld-inc
+++ b/server/lib/bkctld-inc
@@ -16,7 +16,7 @@ create_inc_btrfs() {
 
     btrfs_bin=$(command -v btrfs)
     if [ -z "${btrfs_bin}" ]; then
-        error "btrfs not found. Please install brtfs-progs."
+        error "btrfs not found. Please install btrfs-progs."
     fi
 
     if dry_run; then
diff --git a/lib/bkctld-inc-lock b/server/lib/bkctld-inc-lock
similarity index 91%
rename from lib/bkctld-inc-lock
rename to server/lib/bkctld-inc-lock
index a71edf0..e3c704e 100755
--- a/lib/bkctld-inc-lock
+++ b/server/lib/bkctld-inc-lock
@@ -13,8 +13,8 @@ target_path="${2:?}"
 lock_target() {
     target="${1:?}"
     btrfs_bin=$(command -v btrfs)
-    if [ -z ${btrfs_bin} ]; then
-        error "btrfs not found. Please install brtfs-progs."
+    if [ -z ${btrfs_bin} ]; then
+        error "btrfs not found. Please install btrfs-progs."
     fi
     if is_btrfs "${target}"; then
         ${btrfs_bin} property set -ts "${target}" ro true
@@ -26,7 +26,7 @@ lock_target() {
 unlock_target() {
     target="${1:?}"
     btrfs_bin=$(command -v btrfs)
-    if [ -z ${btrfs_bin} ]; then
+    if [ -z ${btrfs_bin} ]; then
         error "btrfs not found. Please install brtfs-progs."
     fi
     if is_btrfs "${target}"; then
diff --git a/lib/bkctld-init b/server/lib/bkctld-init
similarity index 83%
rename from lib/bkctld-init
rename to server/lib/bkctld-init
index 1e35f19..14a1000 100755
--- a/lib/bkctld-init
+++ b/server/lib/bkctld-init
@@ -18,12 +18,11 @@ test -d "${jail_path}" && error "Skip jail \`${jail_name}' : it already exists"
 # Create config and jails directory
 mkdir --parents "${CONFDIR}" "${JAILDIR}"
 
-btrfs_bin=$(command -v btrfs)
-if [ -z ${btrfs_bin} ]; then
-    error "btrfs not found. Please install brtfs-progs."
-fi
-
 if is_btrfs "$(dirname "${JAILDIR}")" || is_btrfs "${JAILDIR}"; then
+    btrfs_bin=$(command -v btrfs)
+    if [ -z ${btrfs_bin} ]; then
+        error "btrfs not found. Please install btrfs-progs."
+    fi
     ${btrfs_bin} subvolume create "${jail_path}"
 else
     mkdir --parents "${jail_path}"
diff --git a/lib/bkctld-ip b/server/lib/bkctld-ip
similarity index 93%
rename from lib/bkctld-ip
rename to server/lib/bkctld-ip
index 83e8e33..7887cf7 100755
--- a/lib/bkctld-ip
+++ b/server/lib/bkctld-ip
@@ -38,7 +38,7 @@ else
         allow_users="${allow_users} root@${new_ip}"
     done
     if grep -q -E "^AllowUsers" "${jail_sshd_config}"; then
-        sed -i "s~^AllowUsers .*~${allow_users}~" "${jail_sshd_config}"
+        sed --follow-symlinks --in-place "s~^AllowUsers .*~${allow_users}~" "${jail_sshd_config}"
     else
         error "No \`AllowUsers' directive found in \`${jail_sshd_config}'"
     fi
diff --git a/lib/bkctld-is-on b/server/lib/bkctld-is-on
similarity index 100%
rename from lib/bkctld-is-on
rename to server/lib/bkctld-is-on
diff --git a/lib/bkctld-key b/server/lib/bkctld-key
similarity index 100%
rename from lib/bkctld-key
rename to server/lib/bkctld-key
diff --git a/lib/bkctld-list b/server/lib/bkctld-list
similarity index 100%
rename from lib/bkctld-list
rename to server/lib/bkctld-list
diff --git a/lib/bkctld-port b/server/lib/bkctld-port
similarity index 91%
rename from lib/bkctld-port
rename to server/lib/bkctld-port
index 2b1f17d..77cf4cd 100755
--- a/lib/bkctld-port
+++ b/server/lib/bkctld-port
@@ -27,7 +27,7 @@ else
         port=$((port+1))
         [ "${port}" -le 1 ] && port=2222
     fi
-    sed -i "s/^Port .*/Port ${port}/" "${jail_sshd_config}"
+    sed --follow-symlinks --in-place "s/^Port .*/Port ${port}/" "${jail_sshd_config}"
 
     notice "Update SSH port \`${port}' for jail \`${jail_name}' : OK"
 
diff --git a/lib/bkctld-reload b/server/lib/bkctld-reload
similarity index 100%
rename from lib/bkctld-reload
rename to server/lib/bkctld-reload
diff --git a/lib/bkctld-remove b/server/lib/bkctld-remove
similarity index 95%
rename from lib/bkctld-remove
rename to server/lib/bkctld-remove
index 731d414..f3dc6c3 100755
--- a/lib/bkctld-remove
+++ b/server/lib/bkctld-remove
@@ -53,8 +53,8 @@ rm -f "${CONFDIR}/${jail_name}"
 rm -rf "$(jail_config_dir "${jail_name}")"
 
 btrfs_bin=$(command -v btrfs)
-if [ -z ${btrfs_bin} ]; then
-    error "btrfs not found. Please install brtfs-progs."
+if [ -z ${btrfs_bin} ]; then
+    error "btrfs not found. Please install btrfs-progs."
 fi
 
 if is_btrfs "${jail_path}"; then
diff --git a/lib/bkctld-rename b/server/lib/bkctld-rename
similarity index 100%
rename from lib/bkctld-rename
rename to server/lib/bkctld-rename
diff --git a/lib/bkctld-restart b/server/lib/bkctld-restart
similarity index 100%
rename from lib/bkctld-restart
rename to server/lib/bkctld-restart
diff --git a/lib/bkctld-rm b/server/lib/bkctld-rm
similarity index 98%
rename from lib/bkctld-rm
rename to server/lib/bkctld-rm
index 926877e..28caef8 100755
--- a/lib/bkctld-rm
+++ b/server/lib/bkctld-rm
@@ -63,8 +63,8 @@ delete_inc_btrfs() {
     inc_path=$(inc_path "${jail_name}" "${inc_name}")
     btrfs_bin=$(command -v btrfs)
 
-    if [ -z ${btrfs_bin} ]; then
-        error "btrfs not found. Please install brtfs-progs."
+    if [ -z ${btrfs_bin} ]; then
+        error "btrfs not found. Please install btrfs-progs."
     fi
 
     if dry_run; then
diff --git a/lib/bkctld-start b/server/lib/bkctld-start
similarity index 100%
rename from lib/bkctld-start
rename to server/lib/bkctld-start
diff --git a/lib/bkctld-stats b/server/lib/bkctld-stats
similarity index 100%
rename from lib/bkctld-stats
rename to server/lib/bkctld-stats
diff --git a/lib/bkctld-status b/server/lib/bkctld-status
similarity index 93%
rename from lib/bkctld-status
rename to server/lib/bkctld-status
index e815927..b7cadbb 100755
--- a/lib/bkctld-status
+++ b/server/lib/bkctld-status
@@ -27,4 +27,4 @@ status="OFF"
 port=$("${LIBDIR}/bkctld-port" "${jail_name}")
 ip=$("${LIBDIR}/bkctld-ip" "${jail_name}" | xargs | tr -s ' ' ',')
 
-echo "${jail_name} ${status} ${port} ${incs_policy} ${ip}" | awk '{ printf("%- 30s %- 10s %- 10s %- 10s %- 40s\n", $1, $2, $3, $4, $5); }'
+echo "${jail_name} ${status} ${port} ${incs_policy} ${ip}" | awk '{ printf("%- 30s %- 10s %- 10s %- 25s %- 20s\n", $1, $2, $3, $4, $5); }'
diff --git a/lib/bkctld-stop b/server/lib/bkctld-stop
similarity index 100%
rename from lib/bkctld-stop
rename to server/lib/bkctld-stop
diff --git a/lib/bkctld-sync b/server/lib/bkctld-sync
similarity index 100%
rename from lib/bkctld-sync
rename to server/lib/bkctld-sync
diff --git a/lib/bkctld-update b/server/lib/bkctld-update
similarity index 100%
rename from lib/bkctld-update
rename to server/lib/bkctld-update
diff --git a/lib/bkctld-upgrade-config b/server/lib/bkctld-upgrade-config
similarity index 100%
rename from lib/bkctld-upgrade-config
rename to server/lib/bkctld-upgrade-config
diff --git a/lib/includes b/server/lib/includes
similarity index 99%
rename from lib/includes
rename to server/lib/includes
index 9c1f074..3892a2b 100755
--- a/lib/includes
+++ b/server/lib/includes
@@ -6,7 +6,7 @@
 
 [ -f /etc/default/bkctld ] && . /etc/default/bkctld
 
-VERSION="2.11.1"
+VERSION="22.04"
 
 LIBDIR=${LIBDIR:-/usr/lib/bkctld}
 CONFDIR="${CONFDIR:-/etc/evobackup}"
@@ -34,7 +34,7 @@ show_version() {
     cat <<END
 bkctld version ${VERSION}
 
-Copyright 2004-2021 Evolix <info@evolix.fr>,
+Copyright 2004-2022 Evolix <info@evolix.fr>,
                     Victor Laborie <vlaborie@evolix.fr>,
                     Jérémy Lecour <jlecour@evolix.fr>
                     and others.
diff --git a/test/checks.bats b/server/test/checks.bats
similarity index 97%
rename from test/checks.bats
rename to server/test/checks.bats
index 65a2ccc..bc6da3b 100644
--- a/test/checks.bats
+++ b/server/test/checks.bats
@@ -144,7 +144,8 @@ OUT
 @test "Check setup WARNING if firewall rules are not sourced" {
     /usr/lib/bkctld/bkctld-start ${JAILNAME}
 
-    firewall_rules_file="/etc/firewall.rc.jails"
+    mkdir /etc/minifirewall.d/
+    firewall_rules_file="/etc/minifirewall.d/bkctld"
     set_variable "/etc/default/bkctld" "FIREWALL_RULES" "${firewall_rules_file}"
     echo "" > "${firewall_rules_file}"
 
@@ -158,7 +159,8 @@ OUT
 @test "Check setup OK if firewall rules are sourced" {
     /usr/lib/bkctld/bkctld-start ${JAILNAME}
 
-    firewall_rules_file="/etc/firewall.rc.jails"
+    mkdir /etc/minifirewall.d/
+    firewall_rules_file="/etc/minifirewall.d/bkctld"
     set_variable "/etc/default/bkctld" "FIREWALL_RULES" "${firewall_rules_file}"
     echo "" > "${firewall_rules_file}"
 
diff --git a/test/connectivity.bats b/server/test/connectivity.bats
similarity index 97%
rename from test/connectivity.bats
rename to server/test/connectivity.bats
index 03d0cee..7e64530 100644
--- a/test/connectivity.bats
+++ b/server/test/connectivity.bats
@@ -61,7 +61,7 @@ load test_helper
 
 @test "Missing AllowUsers" {
     # Remove AllowUsers directive in SSH config
-    sed -i '/^AllowUsers/d' "${JAILPATH}/etc/ssh/sshd_config"
+    sed --follow-symlinks --in-place '/^AllowUsers/d' "${JAILPATH}/etc/ssh/sshd_config"
     # An error should be raised when trying to add an IP restriction
     run /usr/lib/bkctld/bkctld-ip "${JAILNAME}" "10.0.0.1"
     assert_failure
diff --git a/test/incs.bats b/server/test/incs.bats
similarity index 100%
rename from test/incs.bats
rename to server/test/incs.bats
diff --git a/test/main.bats b/server/test/main.bats
similarity index 100%
rename from test/main.bats
rename to server/test/main.bats
diff --git a/test/test_helper.bash b/server/test/test_helper.bash
similarity index 94%
rename from test/test_helper.bash
rename to server/test/test_helper.bash
index b0cf5d3..8de9fb5 100644
--- a/test/test_helper.bash
+++ b/server/test/test_helper.bash
@@ -40,7 +40,7 @@ set_variable() {
     var_value=${3:-}
 
     if grep -qE "^\s*${var_name}=" "${file}"; then
-        sed -i "s|^\s*${var_name}=.*|${var_name}=${var_value}|" "${file}"
+        sed --follow-symlinks --in-place "s|^\s*${var_name}=.*|${var_name}=${var_value}|" "${file}"
     else
         echo "${var_name}=${var_value}" >> "${file}"
     fi
@@ -49,7 +49,7 @@ remove_variable() {
     file=${1:?}
     var_name=${2:?}
 
-    sed -i "s|^\s*${var_name}=.*|d" "${file}"
+    sed --follow-symlinks --in-place "s|^\s*${var_name}=.*|d" "${file}"
 }
 
 is_btrfs() {
diff --git a/tpl/check_policy.tpl b/server/tpl/check_policy.tpl
similarity index 100%
rename from tpl/check_policy.tpl
rename to server/tpl/check_policy.tpl
diff --git a/tpl/group b/server/tpl/group
similarity index 100%
rename from tpl/group
rename to server/tpl/group
diff --git a/tpl/incs_policy.tpl b/server/tpl/incs_policy.tpl
similarity index 100%
rename from tpl/incs_policy.tpl
rename to server/tpl/incs_policy.tpl
diff --git a/tpl/passwd b/server/tpl/passwd
similarity index 100%
rename from tpl/passwd
rename to server/tpl/passwd
diff --git a/tpl/shadow b/server/tpl/shadow
similarity index 100%
rename from tpl/shadow
rename to server/tpl/shadow
diff --git a/tpl/sshd_config b/server/tpl/sshd_config
similarity index 100%
rename from tpl/sshd_config
rename to server/tpl/sshd_config
diff --git a/tpl/sshrc b/server/tpl/sshrc
similarity index 100%
rename from tpl/sshrc
rename to server/tpl/sshrc