Fix package typo.

Signed-off-by: Jean-Yves Tinevez <jeanyves.tinevez@gmail.com>
Re-arrange methods order.

Signed-off-by: Jean-Yves Tinevez <jeanyves.tinevez@gmail.com>