Make it a single package - it's gonna be easier
Signed-off-by: Olivier <ostroesser@gmail.com>