Let's avoid conflicts with main app.

Signed-off-by: Victor Berger <victor.berger@m4x.org>
Various cleaning.

Signed-off-by: Victor Berger <victor.berger@m4x.org>