This MR simplifies the package organisation by mutualising a maximum of code and streamlining the CLI.