infra: refactorization

Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>