Redo the package move properly

Signed-off-by: Francis Galiegue <fgaliegue@gmail.com>