Move some more content around

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>