Refactorisation du code source

Signed-off-by: stefens <stephen.schmidt.pro@gmail.com>