Reorganize imports, part 2

Meh. That will teach me not being at the root of the working tree when doing git
add -u.

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