Group public methods together (cleanup)

Signed-off-by: Maxime Petazzoni <max@signalfuse.com>