Refactor for a more clean Common.Public

Signed-off-by: Pascal Piche <pascal@deuxhuithuit.com>