Organize files

Signed-off-by: Dominique SIACCI <siacci@duoapps.com>